Merge remote-tracking branch 'origin/2.4' into merge-2.4

[profile/ivi/opencv.git] / samples / cpp / video_dmtx.cpp

diff --git a/samples/cpp/video_dmtx.cpp b/samples/cpp/video_dmtx.cpp
index 4d36a38..e410f7c 100644 (file)
--- a/samples/cpp/video_dmtx.cpp
+++ b/samples/cpp/video_dmtx.cpp
@@ -44,7 +44,7 @@ namespace
         char filename[200];
         string window_name = "video | q or esc to quit";
         cout << "press space to save a picture. q or esc to quit" << endl;
-        namedWindow(window_name, CV_WINDOW_KEEPRATIO); //resizable window;
+        namedWindow(window_name, WINDOW_KEEPRATIO); //resizable window;
         Mat frame;
         for (;;)
         {
@@ -52,8 +52,8 @@ namespace
             if (frame.empty())
                 break;
             cv::Mat gray;
-            cv::cvtColor(frame,gray,CV_RGB2GRAY);
-            vector<string> codes;
+            cv::cvtColor(frame,gray,COLOR_RGB2GRAY);
+            vector<String> codes;
             Mat corners;
             findDataMatrix(gray, codes, corners);
             drawDataMatrixCodes(frame, codes, corners);