fixed build on Windows with MSVC2010

diff --git a/modules/core/test/test_arithm.cpp b/modules/core/test/test_arithm.cpp
index 74d4e46..258b4bd 100644 (file)
--- a/modules/core/test/test_arithm.cpp
+++ b/modules/core/test/test_arithm.cpp
@@ -18,7 +18,7 @@ struct BaseElemWiseOp
     BaseElemWiseOp(int _ninputs, int _flags, double _alpha, double _beta,
                    Scalar _gamma=Scalar::all(0), int _context=1)
     : ninputs(_ninputs), flags(_flags), alpha(_alpha), beta(_beta), gamma(_gamma), context(_context) {}
-    BaseElemWiseOp() { flags = alpha = beta = 0; gamma = Scalar::all(0); }
+    BaseElemWiseOp() { flags = 0; alpha = beta = 0; gamma = Scalar::all(0); }
     virtual ~BaseElemWiseOp() {}
     virtual void op(const vector<Mat>&, Mat&, const Mat&) {}
     virtual void refop(const vector<Mat>&, Mat&, const Mat&) {}
@@ -288,7 +288,7 @@ struct LogicOp : public BaseElemWiseOp
         else
             cvtest::logicOp(src[0], src[1], dst, opcode);
     }
-    double getMaxErr(int depth)
+    double getMaxErr(int)
     {
         return 0;
     }
@@ -339,7 +339,7 @@ struct MinOp : public BaseElemWiseOp
     {
         cvtest::min(src[0], src[1], dst);
     }
-    double getMaxErr(int depth)
+    double getMaxErr(int)
     {
         return 0;
     }
@@ -356,7 +356,7 @@ struct MaxOp : public BaseElemWiseOp
     {
         cvtest::max(src[0], src[1], dst);
     }
-    double getMaxErr(int depth)
+    double getMaxErr(int)
     {
         return 0;
     }
@@ -373,7 +373,7 @@ struct MinSOp : public BaseElemWiseOp
     {
         cvtest::min(src[0], gamma[0], dst);
     }
-    double getMaxErr(int depth)
+    double getMaxErr(int)
     {
         return 0;
     }
@@ -390,7 +390,7 @@ struct MaxSOp : public BaseElemWiseOp
     {
         cvtest::max(src[0], gamma[0], dst);
     }
-    double getMaxErr(int depth)
+    double getMaxErr(int)
     {
         return 0;
     }
@@ -482,7 +482,7 @@ struct SetOp : public BaseElemWiseOp
     {
         dst.setTo(gamma, mask);
     }
-    void refop(const vector<Mat>& src, Mat& dst, const Mat& mask)
+    void refop(const vector<Mat>&, Mat& dst, const Mat& mask)
     {
         cvtest::set(dst, gamma, mask);
     }
@@ -808,7 +808,7 @@ struct FlipOp : public BaseElemWiseOp
     {
         cvtest::flip(src[0], dst, flipcode);
     }
-    void generateScalars(int depth, RNG& rng)
+    void generateScalars(int, RNG& rng)
     {
         flipcode = rng.uniform(0, 3) - 1;
     }
@@ -1291,7 +1291,7 @@ TEST_P(ElemWiseTest, accuracy)
     ElemWiseOpPtr op = GetParam();
     
     int testIdx = 0;
-    RNG rng(cvtest::ARITHM_RNG_SEED);
+    RNG rng((uint64)cvtest::ARITHM_RNG_SEED);
     for( testIdx = 0; testIdx < cvtest::ARITHM_NTESTS; testIdx++ )
     {
         vector<int> size;

diff --git a/modules/features2d/src/blobdetector.cpp b/modules/features2d/src/blobdetector.cpp
index b4fbe20..240cfd3 100644 (file)
--- a/modules/features2d/src/blobdetector.cpp
+++ b/modules/features2d/src/blobdetector.cpp
@@ -41,6 +41,7 @@
  //M*/
 
 #include "precomp.hpp"
+#include <iterator>
 
 //#define DEBUG_BLOB_DETECTOR
 

diff --git a/modules/imgproc/test/test_canny.cpp b/modules/imgproc/test/test_canny.cpp
index c07c76f..568cc7c 100644 (file)
--- a/modules/imgproc/test/test_canny.cpp
+++ b/modules/imgproc/test/test_canny.cpp
@@ -184,7 +184,7 @@ test_Canny( const Mat& src, Mat& dst,
             int dxval = dx.at<short>(y, x), dyval = dy.at<short>(y, x);
             mag.at<float>(y, x) = use_true_gradient ?
                 (float)sqrt((double)(dxval*dxval + dyval*dyval)) :
-                (float)(fabs(dxval) + fabs(dyval));
+                (float)(fabs((double)dxval) + fabs((double)dyval));
         }
     }
 

diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp
index d08e357..d6b3a27 100644 (file)
--- a/modules/ts/include/opencv2/ts/ts.hpp
+++ b/modules/ts/include/opencv2/ts/ts.hpp
@@ -1,6 +1,10 @@
 #ifndef __OPENCV_GTESTCV_HPP__
 #define __OPENCV_GTESTCV_HPP__
 
+#ifndef GTEST_CREATE_AS_SHARED_LIBRARY
+#define GTEST_LINKED_AS_SHARED_LIBRARY 1
+#endif
+
 #include "opencv2/ts/ts_gtest.h"
 #include "opencv2/core/core.hpp"
 

diff --git a/modules/ts/src/precomp.hpp b/modules/ts/src/precomp.hpp
index c7a0720..5ff9395 100644 (file)
--- a/modules/ts/src/precomp.hpp
+++ b/modules/ts/src/precomp.hpp
@@ -1,2 +1,4 @@
+#define GTEST_CREATE_AS_SHARED_LIBRARY 1
+
 #include "opencv2/ts/ts.hpp"
 #include "opencv2/core/core_c.h"

diff --git a/modules/ts/src/ts.cpp b/modules/ts/src/ts.cpp
index f753d39..77ede87 100644 (file)
--- a/modules/ts/src/ts.cpp
+++ b/modules/ts/src/ts.cpp
@@ -68,7 +68,7 @@ namespace cvtest
 
 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
 #ifdef _MSC_VER
-static void setSEHTranslator( unsigned int /*u*/, EXCEPTION_POINTERS* pExp )
+static void SEHTranslator( unsigned int /*u*/, EXCEPTION_POINTERS* pExp )
 {
     int code = TS::FAIL_EXCEPTION;
     switch( pExp->ExceptionRecord->ExceptionCode )