Remove C API from OpenCL module

samples/ocl/facedetect.cpp

@@ -10,6 +10,10 @@
 #include <iostream>
 #include <stdio.h>
 
+int main( int, const char** ) { return 0; }
+
+#if 0
+
 using namespace std;
 using namespace cv;
 
@@ -26,6 +30,8 @@ static void help()
         "Hit any key to quit.\n"
         "Using OpenCV version " << CV_VERSION << "\n" << endl;
 }
+
+
 struct getRect { Rect operator ()(const CvAvgComp& e) const { return e.rect; } };
 void detectAndDraw( Mat& img,
     cv::ocl::OclCascadeClassifier& cascade, CascadeClassifier& nestedCascade,
@@ -230,3 +236,4 @@ void detectAndDraw( Mat& img,
     }
     cv::imshow( "result", img );
 }
+#endif

samples/ocl/hog.cpp

@@ -326,7 +326,7 @@ void App::run()
             for (size_t i = 0; i < found.size(); i++)
             {
                 Rect r = found[i];
-                rectangle(img_to_show, r.tl(), r.br(), CV_RGB(0, 255, 0), 3);
+                rectangle(img_to_show, r.tl(), r.br(), Scalar(0, 255, 0), 3);
             }
 
             if (use_gpu)

samples/ocl/squares.cpp

@@ -137,7 +137,7 @@ static void drawSquares( Mat& image, const vector<vector<Point> >& squares )
     {
         const Point* p = &squares[i][0];
         int n = (int)squares[i].size();
-        polylines(image, &p, &n, 1, true, Scalar(0,255,0), 3, CV_AA);
+        polylines(image, &p, &n, 1, true, Scalar(0,255,0), 3, LINE_AA);
     }
 
     imshow(wndname, image);

samples/ocl/surf_matcher.cpp

@@ -211,8 +211,8 @@ int main(int argc, char* argv[])
 
     //-- Get the corners from the image_1 ( the object to be "detected" )
     std::vector<Point2f> obj_corners(4);
-    obj_corners[0] = cvPoint(0,0); obj_corners[1] = cvPoint( cpu_img1.cols, 0 );
-    obj_corners[2] = cvPoint( cpu_img1.cols, cpu_img1.rows ); obj_corners[3] = cvPoint( 0, cpu_img1.rows );
+    obj_corners[0] = Point(0,0); obj_corners[1] = Point( cpu_img1.cols, 0 );
+    obj_corners[2] = Point( cpu_img1.cols, cpu_img1.rows ); obj_corners[3] = Point( 0, cpu_img1.rows );
     std::vector<Point2f> scene_corners(4);
 
     perspectiveTransform( obj_corners, scene_corners, H);