Merge pull request #1081 from SpecLad:merge-2.4

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

@@ -1130,8 +1130,6 @@ public:
     //! converts dense 2d matrix to the sparse form
     /*!
      \param m the input matrix
-     \param try1d if true and m is a single-column matrix (Nx1),
-            then the sparse matrix will be 1-dimensional.
     */
     explicit SparseMat(const Mat& m);
     //! converts old-style sparse matrix to the new-style. All the data is copied

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

@@ -71,30 +71,6 @@
 #  endif
 #endif
 
-#ifdef _OPENMP
-#  define HAVE_OPENMP
-#endif
-
-#ifdef __APPLE__
-#  define HAVE_GCD
-#endif
-
-#if defined _MSC_VER && _MSC_VER >= 1600
-#  define HAVE_CONCURRENCY
-#endif
-
-#if defined HAVE_TBB
-#  define CV_PARALLEL_FRAMEWORK "tbb"
-#elif defined HAVE_CSTRIPES
-#  define CV_PARALLEL_FRAMEWORK "cstripes"
-#elif defined HAVE_OPENMP
-#  define CV_PARALLEL_FRAMEWORK "openmp"
-#elif defined HAVE_GCD
-#  define CV_PARALLEL_FRAMEWORK "gcd"
-#elif defined HAVE_CONCURRENCY
-#  define CV_PARALLEL_FRAMEWORK "ms-concurrency"
-#endif
-
 namespace cv
 {
 #ifdef HAVE_TBB
@@ -145,6 +121,10 @@ namespace cv
         body(range);
     }
 #endif
+
+    // Returns a static string if there is a parallel framework,
+    // NULL otherwise.
+    CV_EXPORTS const char* currentParallelFramework();
 } //namespace cv
 
 #define CV_INIT_ALGORITHM(classname, algname, memberinit) \