Make highgui.hpp independent from C API

samples/c/adaptiveskindetector.cpp

@@ -40,7 +40,7 @@
 #include <cstring>
 #include <ctime>
 #include "opencv2/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 
 static void help(char **argv)
 {

samples/c/bgfg_codebook.cpp

@@ -24,7 +24,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/video/background_segm.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 #include "opencv2/legacy.hpp"
 
 #include <stdio.h>

samples/c/blobtrack_sample.cpp

@@ -1,7 +1,7 @@
 #include "opencv2/video/background_segm.hpp"
 #include "opencv2/legacy/blobtrack.hpp"
 #include "opencv2/legacy/legacy.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/highgui/highgui_c.h>
 #include <opencv2/imgproc/imgproc_c.h>
 
 #include <stdio.h>

samples/c/convert_cascade.c

@@ -1,5 +1,5 @@
 #include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 
 #include <ctype.h>
 #include <stdio.h>

samples/c/facedetect.cpp

@@ -1,8 +1,10 @@
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/objdetect.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/highgui/highgui_c.h"
+
 #include <cctype>
 #include <iostream>
 #include <iterator>

samples/c/fback_c.c

@@ -1,5 +1,5 @@
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include <stdio.h>
 

samples/c/find_obj.cpp

@@ -6,10 +6,10 @@
  */
 #include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/features2d/features2d.hpp"
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/nonfree/nonfree.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/highgui/highgui_c.h"
 #include "opencv2/legacy/legacy.hpp"
 #include "opencv2/legacy/compat.hpp"
 

samples/c/find_obj_calonder.cpp

@@ -61,7 +61,7 @@ static void trainCalonderClassifier( const string& classifierFilename, const str
         string str;
         getline( is, str );
         if (str.empty()) break;
-        Mat img = imread( str, CV_LOAD_IMAGE_GRAYSCALE );
+        Mat img = imread( str, IMREAD_GRAYSCALE );
         if( !img.empty() )
             trainImgs.push_back( img );
     }
@@ -106,7 +106,7 @@ static void trainCalonderClassifier( const string& classifierFilename, const str
  */
 static void testCalonderClassifier( const string& classifierFilename, const string& imgFilename )
 {
-    Mat img1 = imread( imgFilename, CV_LOAD_IMAGE_GRAYSCALE ), img2, H12;
+    Mat img1 = imread( imgFilename, IMREAD_GRAYSCALE ), img2, H12;
     if( img1.empty() )
     {
         cout << "Test image can not be read." << endl;

samples/c/find_obj_ferns.cpp

@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 
     help();
 
-    Mat object = imread( object_filename, CV_LOAD_IMAGE_GRAYSCALE );
-    Mat scene = imread( scene_filename, CV_LOAD_IMAGE_GRAYSCALE );
+    Mat object = imread( object_filename, IMREAD_GRAYSCALE );
+    Mat scene = imread( scene_filename, IMREAD_GRAYSCALE );
 
     if( !object.data || !scene.data )
     {
@@ -47,9 +47,9 @@ int main(int argc, char** argv)
 
     resize(scene, image, Size(), 1./imgscale, 1./imgscale, INTER_CUBIC);
 
-    cvNamedWindow("Object", 1);
-    cvNamedWindow("Image", 1);
-    cvNamedWindow("Object Correspondence", 1);
+    namedWindow("Object", 1);
+    namedWindow("Image", 1);
+    namedWindow("Object Correspondence", 1);
 
     Size patchSize(32, 32);
     LDetector ldetector(7, 20, 2, 2000, patchSize.width, 2);

samples/c/latentsvmdetect.cpp

@@ -1,5 +1,5 @@
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/objdetect.hpp"
+#include "opencv2/highgui/highgui_c.h"
 #include <stdio.h>
 
 #ifdef HAVE_CVCONFIG_H

samples/c/morphology.c

@@ -1,4 +1,4 @@
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 
 #include <stdio.h>

samples/c/motempl.c

@@ -1,5 +1,5 @@
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include <time.h>
 #include <stdio.h>

samples/c/one_way_sample.cpp

@@ -49,8 +49,8 @@ int main(int argc, char** argv)
     std::string img2_name = path_name + "/" + std::string(argv[3]);
 
     printf("Reading the images...\n");
-    Mat img1 = imread(img1_name, CV_LOAD_IMAGE_GRAYSCALE);
-    Mat img2 = imread(img2_name, CV_LOAD_IMAGE_GRAYSCALE);
+    Mat img1 = imread(img1_name, IMREAD_GRAYSCALE);
+    Mat img2 = imread(img2_name, IMREAD_GRAYSCALE);
 
     // extract keypoints from the first image
     SURF surf_extractor(5.0e3);

samples/c/smiledetect.cpp

@@ -1,8 +1,10 @@
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/objdetect.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/highgui/highgui_c.h"
+
 #include <cctype>
 #include <iostream>
 #include <iterator>