Merge pull request #76 vpisarev/test_fixes_1

2012-10-22 21:08:47 +04:00
parent 781d89829f fbe0d6963c
commit 22e352d9cc
4 changed files with 5 additions and 4 deletions
--- 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<typename ST, typename DT> struct Cast
 {