Move non-CV functionality from core.hpp to separate utility.hpp header

chenbk85 · Mar 20, 2013 · 89356ff · 89356ff
1 parent 1ad7af3
commit 89356ff
Show file tree

Hide file tree

Showing 90 changed files with 709 additions and 621 deletions.
diff --git a/apps/sft/include/sft/common.hpp b/apps/sft/include/sft/common.hpp
@@ -44,6 +44,7 @@
 #define __SFT_COMMON_HPP__
 
 #include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
 #include <opencv2/softcascade.hpp>
 
 namespace cv {using namespace softcascade;}

diff --git a/include/opencv/cv.h b/include/opencv/cv.h
@@ -62,6 +62,7 @@
 
 #include "opencv2/core/core_c.h"
 #include "opencv2/core.hpp"
+#include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"

diff --git a/modules/calib3d/src/precomp.hpp b/modules/calib3d/src/precomp.hpp
@@ -49,8 +49,11 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/core/internal.hpp"
 #include "opencv2/features2d.hpp"
+
+#include "opencv2/core/utility.hpp"
+#include "opencv2/core/internal.hpp"
+
 #include <vector>
 
 #ifdef HAVE_TEGRA_OPTIMIZATION

diff --git a/modules/calib3d/test/test_precomp.hpp b/modules/calib3d/test/test_precomp.hpp
@@ -9,12 +9,12 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
+#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/highgui.hpp"
-#include <iostream>
 
 namespace cvtest
 {

diff --git a/modules/contrib/src/detection_based_tracker.cpp b/modules/contrib/src/detection_based_tracker.cpp
@@ -1,5 +1,6 @@
 #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
 #include "opencv2/contrib/detection_based_tracker.hpp"
+#include "opencv2/core/utility.hpp"
 
 #include <pthread.h>
 

diff --git a/modules/contrib/src/precomp.hpp b/modules/contrib/src/precomp.hpp
@@ -52,6 +52,8 @@
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
+
+#include "opencv2/core/utility.hpp"
 #include "opencv2/core/internal.hpp"
 
 namespace cv