Commit fbe0d696 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by Andrey Kamaev

disabled several tests on Mac when no FFMPEG is used; disabled automatic table…

disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
parent eea6fe8e
...@@ -109,6 +109,6 @@ void CV_FramecountTest::run(int) ...@@ -109,6 +109,6 @@ void CV_FramecountTest::run(int)
} }
} }
} }
#if BUILD_WITH_VIDEO_INPUT_SUPPORT #if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
TEST(Highgui_Video, framecount) {CV_FramecountTest test; test.safe_run();} TEST(Highgui_Video, framecount) {CV_FramecountTest test; test.safe_run();}
#endif #endif
...@@ -217,7 +217,7 @@ void CV_VideoRandomPositioningTest::run(int) ...@@ -217,7 +217,7 @@ void CV_VideoRandomPositioningTest::run(int)
run_test(RANDOM); run_test(RANDOM);
} }
#if BUILD_WITH_VIDEO_INPUT_SUPPORT #if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
TEST (Highgui_Video, seek_progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); } TEST (Highgui_Video, seek_progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); }
TEST (Highgui_Video, seek_random) { CV_VideoRandomPositioningTest test; test.safe_run(); } TEST (Highgui_Video, seek_random) { CV_VideoRandomPositioningTest test; test.safe_run(); }
#endif #endif
\ No newline at end of file
...@@ -173,6 +173,6 @@ public: ...@@ -173,6 +173,6 @@ public:
Size framesize; Size framesize;
}; };
#if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT #if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT && defined HAVE_FFMPEG
TEST(Highgui_Video, seek_random_synthetic) { CV_PositioningTest test; test.safe_run(); } TEST(Highgui_Video, seek_random_synthetic) { CV_PositioningTest test; test.safe_run(); }
#endif #endif
...@@ -220,7 +220,7 @@ static const void* initInterTab2D( int method, bool fixpt ) ...@@ -220,7 +220,7 @@ static const void* initInterTab2D( int method, bool fixpt )
return fixpt ? (const void*)itab : (const void*)tab; return fixpt ? (const void*)itab : (const void*)tab;
} }
#ifndef __MINGW32__
static bool initAllInterTab2D() static bool initAllInterTab2D()
{ {
return initInterTab2D( INTER_LINEAR, false ) && return initInterTab2D( INTER_LINEAR, false ) &&
...@@ -232,6 +232,7 @@ static bool initAllInterTab2D() ...@@ -232,6 +232,7 @@ static bool initAllInterTab2D()
} }
static volatile bool doInitAllInterTab2D = initAllInterTab2D(); static volatile bool doInitAllInterTab2D = initAllInterTab2D();
#endif
template<typename ST, typename DT> struct Cast template<typename ST, typename DT> struct Cast
{ {
......
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