Commit b3b80bc3 authored by Andrey Morozov's avatar Andrey Morozov

fixed compile under linux

parent eac055a2
...@@ -24,7 +24,7 @@ private: ...@@ -24,7 +24,7 @@ private:
class CV_VideoProgressivePositioningTest: public CV_VideoPositioningTest class CV_VideoProgressivePositioningTest: public CV_VideoPositioningTest
{ {
public: public:
CV_VideoProgressivePositioningTest::CV_VideoProgressivePositioningTest(): CV_VideoPositioningTest() {}; CV_VideoProgressivePositioningTest() : CV_VideoPositioningTest() {};
~CV_VideoProgressivePositioningTest(); ~CV_VideoProgressivePositioningTest();
void run(int); void run(int);
}; };
...@@ -32,7 +32,7 @@ public: ...@@ -32,7 +32,7 @@ public:
class CV_VideoRandomPositioningTest: public CV_VideoPositioningTest class CV_VideoRandomPositioningTest: public CV_VideoPositioningTest
{ {
public: public:
CV_VideoRandomPositioningTest::CV_VideoRandomPositioningTest(): CV_VideoPositioningTest() {}; CV_VideoRandomPositioningTest(): CV_VideoPositioningTest() {};
~CV_VideoRandomPositioningTest(); ~CV_VideoRandomPositioningTest();
void run(int); void run(int);
}; };
...@@ -48,7 +48,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method) ...@@ -48,7 +48,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method)
int N = (int)cvGetCaptureProperty(cap, CV_CAP_PROP_FRAME_COUNT); int N = (int)cvGetCaptureProperty(cap, CV_CAP_PROP_FRAME_COUNT);
switch(method) switch(method)
{ {
case NAVIGATION_METHOD::PROGRESSIVE: case PROGRESSIVE:
{ {
int pos = 1, step = 20; int pos = 1, step = 20;
do do
...@@ -59,7 +59,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method) ...@@ -59,7 +59,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method)
while (pos <= N); while (pos <= N);
break; break;
} }
case NAVIGATION_METHOD::RANDOM: case RANDOM:
{ {
RNG rng(N); RNG rng(N);
idx.clear(); idx.clear();
...@@ -143,13 +143,13 @@ void CV_VideoPositioningTest::run_test(int method) ...@@ -143,13 +143,13 @@ void CV_VideoPositioningTest::run_test(int method)
void CV_VideoProgressivePositioningTest::run(int) void CV_VideoProgressivePositioningTest::run(int)
{ {
run_test(NAVIGATION_METHOD::PROGRESSIVE); run_test(PROGRESSIVE);
} }
void CV_VideoRandomPositioningTest::run(int) void CV_VideoRandomPositioningTest::run(int)
{ {
run_test(NAVIGATION_METHOD::RANDOM); run_test(RANDOM);
} }
TEST (HighguiPositioning, progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); } TEST (HighguiPositioning, progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); }
TEST (HighguiPositioning, random) { CV_VideoRandomPositioningTest test; test.safe_run(); } TEST (HighguiPositioning, random) { CV_VideoRandomPositioningTest test; test.safe_run(); }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment