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

[profile/ivi/opencv.git] / samples / cpp / tutorial_code / introduction / windows_visual_studio_Opencv / Test.cpp

diff --git a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
index 240a2e1..a2597a7 100644 (file)
--- a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
+++ b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
@@ -59,10 +59,10 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    Size refS = Size((int) captRefrnc.get(CV_CAP_PROP_FRAME_WIDTH),
-                     (int) captRefrnc.get(CV_CAP_PROP_FRAME_HEIGHT)),
-         uTSi = Size((int) captUndTst.get(CV_CAP_PROP_FRAME_WIDTH),
-                     (int) captUndTst.get(CV_CAP_PROP_FRAME_HEIGHT));
+    Size refS = Size((int) captRefrnc.get(CAP_PROP_FRAME_WIDTH),
+                     (int) captRefrnc.get(CAP_PROP_FRAME_HEIGHT)),
+         uTSi = Size((int) captUndTst.get(CAP_PROP_FRAME_WIDTH),
+                     (int) captUndTst.get(CAP_PROP_FRAME_HEIGHT));
 
     if (refS != uTSi)
     {
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
             moveWindow(WIN_UT, refS.width,            0);               //1500, 2
 
     cout << "Frame resolution: Width=" << refS.width << "  Height=" << refS.height
-         << " of nr#: " << captRefrnc.get(CV_CAP_PROP_FRAME_COUNT) << endl;
+         << " of nr#: " << captRefrnc.get(CAP_PROP_FRAME_COUNT) << endl;
 
     cout << "PSNR trigger value " <<
           setiosflags(ios::fixed) << setprecision(3) << psnrTriggerValue << endl;