Reduce Mat_ usage.

Author: asmorkalov

modules/face/src/facemarkLBF.cpp

@@ -661,11 +661,10 @@ FacemarkLBFImpl::BBox::BBox(double _x, double _y, double w, double h) {
 
 // Project absolute shape to relative shape binding to this bbox
 Mat FacemarkLBFImpl::BBox::project(const Mat &shape) const {
-    Mat_<double> res(shape.rows, shape.cols);
-    const Mat_<double> &shape_ = (Mat_<double>)shape;
+    Mat res(shape.rows, shape.cols, CV_64FC1);
     for (int i = 0; i < shape.rows; i++) {
-        res(i, 0) = (shape_(i, 0) - x_center) / x_scale;
-        res(i, 1) = (shape_(i, 1) - y_center) / y_scale;
+        res.at<double>(i, 0) = (shape.at<double>(i, 0) - x_center) / x_scale;
+        res.at<double>(i, 1) = (shape.at<double>(i, 1) - y_center) / y_scale;
     }
     return res;
 }
@@ -997,7 +996,7 @@ void FacemarkLBFImpl::RandomForest::train(std::vector<Mat> &imgs, std::vector<Ma
 }
 
 Mat FacemarkLBFImpl::RandomForest::generateLBF(Mat &img, Mat &current_shape, BBox &bbox, Mat &mean_shape) {
-    Mat_<int> lbf_feat(1, landmark_n*trees_n);
+    Mat lbf_feat(1, landmark_n*trees_n, CV_32SC1);
     double scale;
     Mat_<double> rotate;
     calcSimilarityTransform(bbox.project(current_shape), mean_shape, scale, rotate);
@@ -1036,7 +1035,7 @@ Mat FacemarkLBFImpl::RandomForest::generateLBF(Mat &img, Mat &current_shape, BBo
                     idx = 2 * idx + 1;
                 }
             }
-            lbf_feat(i*trees_n + j) = (i*trees_n + j)*base + code;
+            lbf_feat.at<int>(i*trees_n + j) = (i*trees_n + j)*base + code;
         }
     }
     return lbf_feat;
@@ -1365,7 +1364,7 @@ Mat FacemarkLBFImpl::Regressor::supportVectorRegression(
 
 Mat FacemarkLBFImpl::Regressor::globalRegressionPredict(const Mat &lbf, int stage) {
     const Mat_<double> &weight = (Mat_<double>)gl_regression_weights[stage];
-    Mat_<double> delta_shape(weight.rows / 2, 2);
+    Mat delta_shape(weight.rows / 2, 2, CV_64FC1);
     const double *w_ptr = NULL;
     const int *lbf_ptr = lbf.ptr<int>(0);
 
@@ -1374,12 +1373,12 @@ Mat FacemarkLBFImpl::Regressor::globalRegressionPredict(const Mat &lbf, int stag
         w_ptr = weight.ptr<double>(2 * i);
         double y = 0;
         for (int j = 0; j < lbf.cols; j++) y += w_ptr[lbf_ptr[j]];
-        delta_shape(i, 0) = y;
+        delta_shape.at<double>(i, 0) = y;
 
         w_ptr = weight.ptr<double>(2 * i + 1);
         y = 0;
         for (int j = 0; j < lbf.cols; j++) y += w_ptr[lbf_ptr[j]];
-        delta_shape(i, 1) = y;
+        delta_shape.at<double>(i, 1) = y;
     }
     return delta_shape;
 } // Regressor::globalRegressionPredict

modules/face/src/mace.cpp

@@ -102,7 +102,7 @@ struct MACEImpl CV_FINAL : MACE {
         Mat complexInput;
         merge(input, 2, complexInput);
 
-        Mat_<Vec2d> dftImg(IMGSIZE*2, IMGSIZE*2, 0.0);
+        Mat dftImg(IMGSIZE*2, IMGSIZE*2, CV_64FC2, 0.0);
         complexInput.copyTo(dftImg(Rect(0,0,IMGSIZE,IMGSIZE)));
 
         dft(dftImg, dftImg);

modules/videostab/src/global_motion.cpp

@@ -82,7 +82,7 @@ namespace videostab
 {
 
 // does isotropic normalization
-static Mat normalizePoints(int npoints, Point2f *points)
+static Mat_<float> normalizePoints(int npoints, Point2f *points)
 {
     float cx = 0.f, cy = 0.f;
     for (int i = 0; i < npoints; ++i)

modules/ximgproc/test/test_sparse_match_interpolator.cpp

@@ -17,7 +17,7 @@ Mat readOpticalFlow( const String& path )
 //    CV_Assert(sizeof(float) == 4);
     //FIXME: ensure right sizes of int and float - here and in writeOpticalFlow()
 
-    Mat_<Point2f> flow;
+    Mat flow;
     std::ifstream file(path.c_str(), std::ios_base::binary);
     if ( !file.good() )
         return flow; // no file - return empty matrix
@@ -32,7 +32,7 @@ Mat readOpticalFlow( const String& path )
     file.read((char*) &width, 4);
     file.read((char*) &height, 4);
 
-    flow.create(height, width);
+    flow.create(height, width, CV_32FC2);
 
     for ( int i = 0; i < flow.rows; ++i )
     {
@@ -47,7 +47,7 @@ Mat readOpticalFlow( const String& path )
                 return flow;
             }
 
-            flow(i, j) = u;
+            flow.at<Point2f>(i, j) = u;
         }
     }
     file.close();