Merge branch '2.4'

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