Merge pull request #747 from taka-no-me:split_c_cpp

2013-04-04 00:55:21 +04:00
parent 422803e866 d4bb421ce2
commit 78c70ab948
232 changed files with 14517 additions and 12876 deletions
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@@ -41,7 +41,6 @@

 #include "precomp.hpp"

-#include "opencv2/core/internal.hpp"
 #if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
 #include <Eigen/Array>
 #endif
--- a/modules/features2d/src/precomp.hpp
+++ b/modules/features2d/src/precomp.hpp
@@ -43,16 +43,12 @@
 #ifndef __OPENCV_PRECOMP_H__
 #define __OPENCV_PRECOMP_H__

-#ifdef HAVE_CVCONFIG_H
-#include "cvconfig.h"
-#endif
-
 #include "opencv2/features2d.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"

 #include "opencv2/core/utility.hpp"
-#include "opencv2/core/internal.hpp"
+#include "opencv2/core/private.hpp"

 #include <algorithm>