fixed build problems on Windows

modules/core/include/opencv2/core/core.hpp

@@ -4117,7 +4117,8 @@ public:
     int index;
 };
 
-    
+
+#if 0
 class CV_EXPORTS AlgorithmImpl;
 
 /*!
@@ -4163,7 +4164,8 @@ protected:
     
     Ptr<AlgorithmImpl> impl;
 };
-    
+#endif
+
 }
 
 #endif // __cplusplus

modules/core/include/opencv2/core/operations.hpp

@@ -3558,7 +3558,7 @@ template<typename _Tp> static inline std::ostream& operator << (std::ostream& ou
     return out;
 }
     
-template<typename _Tp> struct AlgorithmParamType {};
+/*template<typename _Tp> struct AlgorithmParamType {};
 template<> struct AlgorithmParamType<int> { enum { type = CV_PARAM_TYPE_INT }; };
 template<> struct AlgorithmParamType<double> { enum { type = CV_PARAM_TYPE_REAL }; };
 template<> struct AlgorithmParamType<string> { enum { type = CV_PARAM_TYPE_STRING }; };
@@ -3600,7 +3600,7 @@ template<typename _Tp> void Algorithm::addParam(int propId, _Tp& value, bool rea
 template<typename _Tp> void Algorithm::setParamRange(int propId, const _Tp& minVal, const _Tp& maxVal)
 {
     setParamRange_(propId, AlgorithmParamType<_Tp>::type, &minVal, &maxVal);
-}
+}*/
     
 }
 

modules/core/src/arithm.cpp

@@ -2271,7 +2271,7 @@ void cv::inRange(const InputArray& _src, const InputArray& _lowerb,
             BinaryFunc sccvtfunc = getConvertFunc(scdepth, CV_32S);
             sccvtfunc(lb.data, 0, 0, 0, (uchar*)ilbuf, 0, Size(cn, 1), 0);
             sccvtfunc(ub.data, 0, 0, 0, (uchar*)iubuf, 0, Size(cn, 1), 0);
-            int minval = getMinVal(depth), maxval = getMaxVal(depth);
+            int minval = cvRound(getMinVal(depth)), maxval = cvRound(getMaxVal(depth));
             
             for( int k = 0; k < cn; k++ )
             {

modules/core/src/mathfuncs.cpp

@@ -115,7 +115,7 @@ static void FastAtan2_32f(const float *Y, const float *X, float *angle, int len,
             a = (y >= 0 ? CV_PI*0.5 : CV_PI*1.5) -
                 x*y*(y2 + 0.43157974*x2)/(y2*y2 + x2*(0.76443945*y2 + 0.05831938*x2) + (float)DBL_EPSILON);
         }
-        angle[i] = a*scale;
+        angle[i] = (float)(a*scale);
 	}
 }
 

modules/core/src/matmul.cpp

@@ -1665,7 +1665,7 @@ diagtransform_( const T* src, T* dst, const WT* m, int len, int cn, int )
         {
             const WT* _m = m;
             for( int j = 0; j < cn; j++, _m += cn + 1 )
-                dst[j] = src[j]*_m[j] + _m[cn];
+                dst[j] = saturate_cast<T>(src[j]*_m[j] + _m[cn]);
         }
     }
 }
@@ -2600,7 +2600,7 @@ static double dotProd_8u(const uchar* src1, const uchar* src2, int len)
         __m128i z = _mm_setzero_si128();
         while( i < len0 )
         {
-            blockSize = std::min(len0 - j, blockSize0);
+            blockSize = std::min(len0 - i, blockSize0);
             __m128i s = _mm_setzero_si128();
             for( j = 0; j <= blockSize - 16; j += 16 )
             {

modules/imgproc/src/sumpixels.cpp

@@ -46,16 +46,16 @@ namespace cv
 {
 
 template<typename T, typename ST, typename QT>
-void integral_( const T* src, size_t srcstep, ST* sum, size_t sumstep,
-                QT* sqsum, size_t sqsumstep, ST* tilted, size_t tiltedstep,
+void integral_( const T* src, size_t _srcstep, ST* sum, size_t _sumstep,
+                QT* sqsum, size_t _sqsumstep, ST* tilted, size_t _tiltedstep,
                 Size size, int cn )
 {
     int x, y, k;
 
-    srcstep /= sizeof(T);
-    sumstep /= sizeof(ST);
-    tiltedstep /= sizeof(ST);
-    sqsumstep /= sizeof(QT);
+    int srcstep = (int)(_srcstep/sizeof(T));
+    int sumstep = (int)(_sumstep/sizeof(ST));
+    int tiltedstep = (int)(_tiltedstep/sizeof(ST));
+    int sqsumstep = (int)(_sqsumstep/sizeof(QT));
 
     size.width *= cn;
 

modules/imgproc/test/test_histograms.cpp

@@ -1509,7 +1509,7 @@ cvTsCalcBackProject( IplImage** images, IplImage* dst, CvHistogram* hist, int* c
 }
 
 
-int CV_CalcBackProjectTest::validate_test_results( int test_case_idx )
+int CV_CalcBackProjectTest::validate_test_results( int /*test_case_idx*/ )
 {
     int code = cvtest::TS::OK;
 

modules/imgproc/test/test_imgwarp.cpp

@@ -629,12 +629,12 @@ int CV_WarpPerspectiveTest::prepare_test_case( int test_case_idx )
 
     s[0] = Point2f(0,0);
     d[0] = Point2f(0,0);
-    s[1] = Point2f(src.cols-1,0);
-    d[1] = Point2f(dst.cols-1,0);
-    s[2] = Point2f(src.cols-1,src.rows-1);
-    d[2] = Point2f(dst.cols-1,dst.rows-1);
-    s[3] = Point2f(0,src.rows-1);
-    d[3] = Point2f(0,dst.rows-1);
+    s[1] = Point2f(src.cols-1.f,0);
+    d[1] = Point2f(dst.cols-1.f,0);
+    s[2] = Point2f(src.cols-1.f,src.rows-1.f);
+    d[2] = Point2f(dst.cols-1.f,dst.rows-1.f);
+    s[3] = Point2f(0,src.rows-1.f);
+    d[3] = Point2f(0,dst.rows-1.f);
 
     float buf[16];
     Mat tmp( 1, 16, CV_32FC1, buf );

modules/video/include/opencv2/video/background_segm.hpp

@@ -400,7 +400,7 @@ public:
 };	
 
 
-class BackgroundSubtractorMOG2 : public BackgroundSubtractor
+class CV_EXPORTS BackgroundSubtractorMOG2 : public BackgroundSubtractor
 {
 public:
     //! the default constructor