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

samples/cpp/bgfg_gmg.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <opencv2/opencv.hpp>
+#include <opencv2/core/utility.hpp>
 #include <iostream>
 
 using namespace cv;

samples/cpp/bgfg_segm.cpp

@@ -1,7 +1,8 @@
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
 #include "opencv2/video/background_segm.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 #include <stdio.h>
 
 using namespace std;

samples/cpp/brief_match_test.cpp

@@ -4,11 +4,12 @@
  *  Created on: Oct 17, 2010
  *      Author: ethan
  */
-#include "opencv2/core/core.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/calib3d.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 #include <vector>
 #include <iostream>
 

samples/cpp/build3dmodel.cpp

@@ -1,8 +1,9 @@
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <map>
 

samples/cpp/calibration.cpp

@@ -1,7 +1,8 @@
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <cctype>
 #include <stdio.h>

samples/cpp/camshiftdemo.cpp

@@ -1,6 +1,7 @@
+#include <opencv2/core/utility.hpp>
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 #include <ctype.h>

samples/cpp/chamfer.cpp

@@ -1,6 +1,7 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/contrib.hpp"
 
 #include <iostream>
 

samples/cpp/connected_components.cpp

@@ -1,5 +1,6 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 #include <iostream>
 
 using namespace cv;

samples/cpp/demhist.cpp

@@ -1,5 +1,6 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 

samples/cpp/detection_based_tracker_sample.cpp

@@ -1,10 +1,11 @@
 #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
 #include <opencv2/core/internal.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/objdetect.hpp>
 #include "opencv2/contrib/detection_based_tracker.hpp"
 
 #include <vector>

samples/cpp/detector_descriptor_matcher_evaluation.cpp

@@ -39,9 +39,10 @@
 //
 //M*/
 
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/features2d.hpp"
 
 #include <stdlib.h>
 #include <stdio.h>

samples/cpp/dft.cpp

@@ -1,6 +1,7 @@
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <stdio.h>
 

samples/cpp/distrans.cpp

@@ -1,5 +1,6 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <stdio.h>
 

samples/cpp/edge.cpp

@@ -1,5 +1,6 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <stdio.h>
 

samples/cpp/facerec_demo.cpp

@@ -16,9 +16,10 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/contrib.hpp"
 
 #include <iostream>
 #include <fstream>

samples/cpp/freak_demo.cpp

@@ -38,11 +38,12 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/features2d/features2d.hpp>
-#include <opencv2/nonfree/features2d.hpp>
-#include <opencv2/legacy/legacy.hpp>
+#include <opencv2/core.hpp>
+#include "opencv2/core/utility.hpp"
+#include <opencv2/highgui.hpp>
+#include <opencv2/features2d.hpp>
+#include <opencv2/nonfree.hpp>
+#include <opencv2/legacy.hpp>
 
 using namespace cv;
 

samples/cpp/image_alignment.cpp

@@ -13,10 +13,10 @@
 * Authors: G. Evangelidis, INRIA, Grenoble, France
 *          M. Asbach, Fraunhofer IAIS, St. Augustin, Germany
 */
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/video/video.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/core/core.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/video.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/core/utility.hpp>
 
 #include <stdio.h>
 #include <string>

samples/cpp/linemod.cpp

@@ -1,8 +1,9 @@
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc/imgproc_c.h> // cvFindContours
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/objdetect/objdetect.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/objdetect.hpp>
+#include <opencv2/highgui.hpp>
 #include <iterator>
 #include <set>
 #include <cstdio>

samples/cpp/opencv_version.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include <opencv2/core/utility.hpp>
 #include <iostream>
 
 const char* keys =

samples/cpp/peopledetect.cpp

@@ -1,3 +1,4 @@
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/objdetect.hpp>
 #include <opencv2/highgui.hpp>

samples/cpp/select3dobj.cpp

@@ -8,10 +8,11 @@
  *
  */
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <ctype.h>
 #include <stdio.h>

samples/cpp/simpleflow_demo.cpp

@@ -1,6 +1,7 @@
+#include <opencv2/core/utility.hpp>
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <cstdio>
 #include <iostream>

samples/cpp/stereo_match.cpp

@@ -11,6 +11,7 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/contrib/contrib.hpp"
+#include "opencv2/core/utility.hpp"
 
 #include <stdio.h>
 

samples/cpp/stitching_detailed.cpp

@@ -45,7 +45,8 @@
 #include <fstream>
 #include <string>
 #include "opencv2/opencv_modules.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/highgui.hpp"
 #include "opencv2/stitching/detail/autocalib.hpp"
 #include "opencv2/stitching/detail/blenders.hpp"
 #include "opencv2/stitching/detail/camera.hpp"

samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp

@@ -3,10 +3,11 @@
 #include <time.h>
 #include <stdio.h>
 
-#include <opencv2/core/core.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/calib3d/calib3d.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/calib3d.hpp>
+#include <opencv2/highgui.hpp>
 
 using namespace cv;
 using namespace std;

samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp

@@ -1,5 +1,6 @@
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
+#include <opencv2/highgui.hpp>
 #include <iostream>
 #include <sstream>
 

samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp

@@ -1,6 +1,7 @@
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/core/utility.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/imgproc.hpp>
 #include <iostream>
 
 using namespace std;

samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp

@@ -1,10 +1,11 @@
 #include <iostream>                   // Console I/O
 #include <sstream>                    // String to number conversion
 
-#include <opencv2/core/core.hpp>      // Basic OpenCV structures
-#include <opencv2/imgproc/imgproc.hpp>// Image processing methods for the CPU
-#include <opencv2/highgui/highgui.hpp>// Read images
-#include <opencv2/gpu/gpu.hpp>        // GPU structures and methods
+#include <opencv2/core.hpp>      // Basic OpenCV structures
+#include <opencv2/core/utility.hpp>
+#include <opencv2/imgproc.hpp>// Image processing methods for the CPU
+#include <opencv2/highgui.hpp>// Read images
+#include <opencv2/gpu.hpp>        // GPU structures and methods
 
 using namespace std;
 using namespace cv;

samples/cpp/tvl1_optical_flow.cpp

@@ -1,8 +1,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "opencv2/video/tracking.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/video.hpp"
+#include "opencv2/highgui.hpp"
 
 using namespace cv;
 using namespace std;

samples/cpp/videostab.cpp

@@ -4,6 +4,7 @@
 #include <sstream>
 #include <stdexcept>
 #include "opencv2/core.hpp"
+#include <opencv2/core/utility.hpp>
 #include "opencv2/video.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"

samples/cpp/watershed.cpp

@@ -1,5 +1,6 @@
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core/utility.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <cstdio>
 #include <iostream>