From b3b80bc39740ba3ce76c8e4ae5af75a5e092af06 Mon Sep 17 00:00:00 2001 From: Andrey Morozov Date: Sun, 5 Feb 2012 08:09:00 +0000 Subject: [PATCH] fixed compile under linux --- modules/highgui/test/test_positioning.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/highgui/test/test_positioning.cpp b/modules/highgui/test/test_positioning.cpp index 4f2b7408eb..64ae7ebde7 100644 --- a/modules/highgui/test/test_positioning.cpp +++ b/modules/highgui/test/test_positioning.cpp @@ -24,7 +24,7 @@ private: class CV_VideoProgressivePositioningTest: public CV_VideoPositioningTest { public: - CV_VideoProgressivePositioningTest::CV_VideoProgressivePositioningTest(): CV_VideoPositioningTest() {}; + CV_VideoProgressivePositioningTest() : CV_VideoPositioningTest() {}; ~CV_VideoProgressivePositioningTest(); void run(int); }; @@ -32,7 +32,7 @@ public: class CV_VideoRandomPositioningTest: public CV_VideoPositioningTest { public: - CV_VideoRandomPositioningTest::CV_VideoRandomPositioningTest(): CV_VideoPositioningTest() {}; + CV_VideoRandomPositioningTest(): CV_VideoPositioningTest() {}; ~CV_VideoRandomPositioningTest(); void run(int); }; @@ -48,7 +48,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method) int N = (int)cvGetCaptureProperty(cap, CV_CAP_PROP_FRAME_COUNT); switch(method) { - case NAVIGATION_METHOD::PROGRESSIVE: + case PROGRESSIVE: { int pos = 1, step = 20; do @@ -59,7 +59,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method) while (pos <= N); break; } - case NAVIGATION_METHOD::RANDOM: + case RANDOM: { RNG rng(N); idx.clear(); @@ -143,13 +143,13 @@ void CV_VideoPositioningTest::run_test(int method) void CV_VideoProgressivePositioningTest::run(int) { - run_test(NAVIGATION_METHOD::PROGRESSIVE); + run_test(PROGRESSIVE); } void CV_VideoRandomPositioningTest::run(int) { - run_test(NAVIGATION_METHOD::RANDOM); + run_test(RANDOM); } TEST (HighguiPositioning, progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); } -TEST (HighguiPositioning, random) { CV_VideoRandomPositioningTest test; test.safe_run(); } \ No newline at end of file +TEST (HighguiPositioning, random) { CV_VideoRandomPositioningTest test; test.safe_run(); }