Merge branch '2.4'

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

@@ -86,6 +86,11 @@
 
 #include <limits>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4127) //conditional expression is constant
+#endif
+
 namespace cv
 {
 
@@ -3950,5 +3955,9 @@ template<typename _Tp> inline void AlgorithmInfo::addParam(Algorithm& algo, cons
 
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 #endif // __cplusplus
 #endif

modules/core/perf/perf_addWeighted.cpp

@@ -23,6 +23,13 @@ PERF_TEST_P(Size_MatType, addWeighted, TYPICAL_MATS_ADWEIGHTED)
 
     declare.in(src1, src2, dst, WARMUP_RNG).out(dst);
 
+    if (CV_MAT_DEPTH(type) == CV_32S)
+    {
+        //see ticket 1529: absdiff can be without saturation on 32S
+        src1 /= 8;
+        src2 /= 8;
+    }
+
     TEST_CYCLE() cv::addWeighted( src1, alpha, src2, beta, gamma, dst, dst.type() );
 
     SANITY_CHECK(dst);

modules/core/src/matrix.cpp

@@ -2543,7 +2543,6 @@ public:
           data(_data),
           centers(_centers)
     {
-        CV_DbgAssert(centers.cols == data.cols);
     }
 
     void operator()( const BlockedRange& range ) const

modules/core/src/parallel.cpp

@@ -361,8 +361,8 @@ void cv::setNumThreads( int threads )
     else if (pplScheduler == 0 || 1 + pplScheduler->GetNumberOfVirtualProcessors() != (unsigned int)threads)
     {
         pplScheduler = Concurrency::Scheduler::Create(Concurrency::SchedulerPolicy(2,
-                       Concurrency::PolicyElementKey::MinConcurrency, threads-1,
-                       Concurrency::PolicyElementKey::MaxConcurrency, threads-1));
+                       Concurrency::MinConcurrency, threads-1,
+                       Concurrency::MaxConcurrency, threads-1));
     }
 
 #endif