Merge pull request #7471 from alalek:fix_java_generator

2016-10-13 15:21:39 +00:00
parent 28b64f6f13 c16c803fe9
commit 699c25a4be
4 changed files with 32 additions and 12 deletions
@@ -3,8 +3,7 @@

 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core.hpp"
-
-#include "features2d_manual.hpp"
+#include "opencv2/features2d.hpp"

 void Mat_to_vector_KeyPoint(cv::Mat& mat, std::vector<cv::KeyPoint>& v_kp);
 void vector_KeyPoint_to_Mat(std::vector<cv::KeyPoint>& v_kp, cv::Mat& mat);