Move C API of opencv_video to separate file

Author: Andrey Kamaev

apps/traincascade/HOGfeatures.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 #include "HOGfeatures.h"
 #include "cascadeclassifier.h"

apps/traincascade/haarfeatures.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 #include "haarfeatures.h"
 #include "cascadeclassifier.h"

apps/traincascade/lbpfeatures.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 #include "lbpfeatures.h"
 #include "cascadeclassifier.h"

include/opencv/cv.h

@@ -63,8 +63,8 @@
 #include "opencv2/core/core_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/photo/photo_c.h"
+#include "opencv2/video/tracking_c.h"
 
-#include "opencv2/video.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/flann.hpp"
 #include "opencv2/calib3d.hpp"

include/opencv/cv.hpp

@@ -51,6 +51,7 @@
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/photo.hpp"
+#include "opencv2/video.hpp"
 #include "opencv2/highgui.hpp"
 
 #endif

include/opencv/cvaux.h

@@ -49,8 +49,8 @@
 #include "opencv2/core/core_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/photo/photo_c.h"
+#include "opencv2/video/tracking_c.h"
 
-#include "opencv2/video.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/objdetect.hpp"

modules/contrib/src/colortracker.cpp

@@ -60,7 +60,7 @@ void CvMeanShiftTracker::newTrackingWindow(Mat image, Rect selection)
     float srange[] = { 0, 1 };
     const float* ranges[] = {hrange, srange};
 
-    cvtColor(image, hsv, CV_BGR2HSV);
+    cvtColor(image, hsv, COLOR_BGR2HSV);
     inRange(hsv, Scalar(0, 30, MIN(10, 256)), Scalar(180, 256, MAX(10, 256)), mask);
 
     hue.create(hsv.size(), CV_8UC2);
@@ -83,7 +83,7 @@ RotatedRect CvMeanShiftTracker::updateTrackingWindow(Mat image)
     float srange[] = { 0, 1 };
     const float* ranges[] = {hrange, srange};
 
-    cvtColor(image, hsv, CV_BGR2HSV);
+    cvtColor(image, hsv, COLOR_BGR2HSV);
     inRange(hsv, Scalar(0, 30, MIN(10, 256)), Scalar(180, 256, MAX(10, 256)), mask);
     hue.create(hsv.size(), CV_8UC2);
     mixChannels(&hsv, 1, &hue, 1, channels, 2);

modules/contrib/src/featuretracker.cpp

@@ -80,7 +80,7 @@ CvFeatureTracker::~CvFeatureTracker()
 void CvFeatureTracker::newTrackingWindow(Mat image, Rect selection)
 {
     image.copyTo(prev_image);
-    cvtColor(prev_image, prev_image_bw, CV_BGR2GRAY);
+    cvtColor(prev_image, prev_image_bw, COLOR_BGR2GRAY);
     prev_trackwindow = selection;
     prev_center.x = selection.x;
     prev_center.y = selection.y;
@@ -148,12 +148,12 @@ Rect CvFeatureTracker::updateTrackingWindowWithFlow(Mat image)
     ittr++;
     Size subPixWinSize(10,10), winSize(31,31);
     Mat image_bw;
-    TermCriteria termcrit(CV_TERMCRIT_ITER | CV_TERMCRIT_EPS, 20, 0.03);
+    TermCriteria termcrit(TermCriteria::COUNT | TermCriteria::EPS, 20, 0.03);
     std::vector<uchar> status;
     std::vector<float> err;
 
-    cvtColor(image, image_bw, CV_BGR2GRAY);
-    cvtColor(prev_image, prev_image_bw, CV_BGR2GRAY);
+    cvtColor(image, image_bw, COLOR_BGR2GRAY);
+    cvtColor(prev_image, prev_image_bw, COLOR_BGR2GRAY);
 
     if (ittr == 1)
     {

modules/legacy/src/blobtrackpostprockalman.cpp

@@ -39,6 +39,7 @@
 //M*/
 
 #include "precomp.hpp"
+#include "opencv2/video/tracking_c.h"
 
 /*======================= KALMAN FILTER =========================*/
 /* State vector is (x,y,w,h,dx,dy,dw,dh). */

modules/legacy/src/camshift.cpp

@@ -39,6 +39,7 @@
 //
 //M*/
 #include "precomp.hpp"
+#include "opencv2/video/tracking_c.h"
 
 CvCamShiftTracker::CvCamShiftTracker()
 {