diff --git a/modules/highgui/test/test_framecount.cpp b/modules/highgui/test/test_framecount.cpp index 7f8c36c00e3ccde1f071f3da31c0f7e23e9b779a..80bcfafb73ab3ac7a95c20227eb8d11ee59385f2 100644 --- a/modules/highgui/test/test_framecount.cpp +++ b/modules/highgui/test/test_framecount.cpp @@ -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();} #endif diff --git a/modules/highgui/test/test_positioning.cpp b/modules/highgui/test/test_positioning.cpp index f143e8a303cc7018bffd2ff236254149afaa15b0..9f022ca9f9f004a0f671f7ef5797ecd6e261f697 100644 --- a/modules/highgui/test/test_positioning.cpp +++ b/modules/highgui/test/test_positioning.cpp @@ -217,7 +217,7 @@ void CV_VideoRandomPositioningTest::run(int) 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_random) { CV_VideoRandomPositioningTest test; test.safe_run(); } #endif \ No newline at end of file diff --git a/modules/highgui/test/test_video_pos.cpp b/modules/highgui/test/test_video_pos.cpp index 92904f5dfe12d67d9d431371373e0142204cf184..ce0df40ff6e0c4f8aa2c780885a5e30ea12473be 100644 --- a/modules/highgui/test/test_video_pos.cpp +++ b/modules/highgui/test/test_video_pos.cpp @@ -173,6 +173,6 @@ public: 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(); } #endif diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp index 6d9a98429062ee3ebf07b53c9a91f074b3f5787d..c2506590d607bc9c85b08db73711da2eca6f2bae 100644 --- a/modules/imgproc/src/imgwarp.cpp +++ b/modules/imgproc/src/imgwarp.cpp @@ -220,7 +220,7 @@ static const void* initInterTab2D( int method, bool fixpt ) return fixpt ? (const void*)itab : (const void*)tab; } - +#ifndef __MINGW32__ static bool initAllInterTab2D() { return initInterTab2D( INTER_LINEAR, false ) && @@ -232,6 +232,7 @@ static bool initAllInterTab2D() } static volatile bool doInitAllInterTab2D = initAllInterTab2D(); +#endif template struct Cast {