mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-10-22 17:26:22 +04:00 committed by Andrey Kamaev
parent eea6fe8e7f
commit fbe0d6963c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/test/test_framecount.cpp
View File

@ -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

2
modules/highgui/test/test_positioning.cpp
View File

@ -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

2
modules/highgui/test/test_video_pos.cpp
View File

@ -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

3
modules/imgproc/src/imgwarp.cpp
View File

@ -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()
} }
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
{ {