Move cv::Mat out of core.hpp

modules/ml/src/boost.cpp

@@ -1655,10 +1655,10 @@ CvBoost::predict( const CvMat* _sample, const CvMat* _missing,
     const int* cmap = data->cat_map->data.i;
     const int* cofs = data->cat_ofs->data.i;
 
-    cv::Mat sample = _sample;
+    cv::Mat sample = cv::cvarrToMat(_sample);
     cv::Mat missing;
     if(!_missing)
-        missing = _missing;
+        missing = cv::cvarrToMat(_missing);
 
     // if need, preprocess the input vector
     if( !raw_mode )

modules/ml/src/rtrees.cpp

@@ -861,7 +861,7 @@ float CvRTrees::predict_prob( const Mat& _sample, const Mat& _missing) const
 
 Mat CvRTrees::getVarImportance()
 {
-    return Mat(get_var_importance());
+    return cvarrToMat(get_var_importance());
 }
 
 // End of file.

modules/ml/src/tree.cpp

@@ -4142,7 +4142,7 @@ void CvDTree::read( CvFileStorage* fs, CvFileNode* node, CvDTreeTrainData* _data
 
 Mat CvDTree::getVarImportance()
 {
-    return Mat(get_var_importance());
+    return cvarrToMat(get_var_importance());
 }
 
 /* End of file. */