Merge pull request #3734 from asmorkalov:as/std_move_warning

asmorkalov · web-flow · commit cb08ac6b2ea8 · 2024-05-15T14:20:55.000+03:00
Fixed Wredundant-move produced by GCC 13.2 (Ubuntu 24.04). #3734 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
diff --git a/modules/face/src/facemarkLBF.cpp b/modules/face/src/facemarkLBF.cpp
@@ -661,24 +661,22 @@ 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 std::move(res);
+    return res;
 }
 
 // Project relative shape to absolute shape binding to this bbox
 Mat FacemarkLBFImpl::BBox::reproject(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_scale + x_center;
-        res(i, 1) = shape_(i, 1)*y_scale + y_center;
+        res.at<double>(i, 0) = shape.at<double>(i, 0)*x_scale + x_center;
+        res.at<double>(i, 1) = shape.at<double>(i, 1)*y_scale + y_center;
     }
-    return std::move(res);
+    return res;
 }
 
 Mat FacemarkLBFImpl::getMeanShape(std::vector<Mat> &gt_shapes, std::vector<BBox> &bboxes) {
@@ -997,7 +995,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,10 +1034,10 @@ 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 std::move(lbf_feat);
+    return lbf_feat;
 }
 
 void FacemarkLBFImpl::RandomForest::write(FileStorage fs, int k) {
@@ -1365,7 +1363,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,14 +1372,14 @@ 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 std::move(delta_shape);
+    return delta_shape;
 } // Regressor::globalRegressionPredict
 
 Mat FacemarkLBFImpl::Regressor::predict(Mat &img, BBox &bbox) {
diff --git a/modules/face/src/mace.cpp b/modules/face/src/mace.cpp
@@ -102,11 +102,11 @@ 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);
-        return std::move(dftImg);
+        return dftImg;
     }
 
 
diff --git a/modules/mcc/test/test_mcc.cpp b/modules/mcc/test/test_mcc.cpp
@@ -102,7 +102,9 @@ TEST(CV_mcc_ccm_test, detect_Macbeth)
 
     // check Macbeth corners
     vector<Point2f> corners = checker->getBox();
-    EXPECT_MAT_NEAR(gold_corners, corners, 3.6); // diff 3.57385 in ARM only
+    // diff 3.57385 corresponds to ARM v8
+    // diff 4.37915 correspnds to Ubuntu 24.04 x86_64 configuration
+    EXPECT_MAT_NEAR(gold_corners, corners, 4.38);
 
     // read gold chartsRGB
     node = fs["chartsRGB"];
@@ -112,7 +114,7 @@ TEST(CV_mcc_ccm_test, detect_Macbeth)
 
     // check chartsRGB
     Mat chartsRGB = checker->getChartsRGB();
-    EXPECT_MAT_NEAR(goldChartsRGB.col(1), chartsRGB.col(1), 0.25); // diff 0.240634 in ARM only
+    EXPECT_MAT_NEAR(goldChartsRGB.col(1), chartsRGB.col(1), 0.3); // diff 0.292077 on Ubuntu 20.04 ARM64
 }
 
 TEST(CV_mcc_ccm_test, compute_ccm)
diff --git a/modules/rgbd/perf/perf_tsdf.cpp b/modules/rgbd/perf/perf_tsdf.cpp
@@ -91,7 +91,7 @@ struct Scene
 {
     virtual ~Scene() {}
     static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere);
-    virtual Mat depth(Affine3f pose) = 0;
+    virtual Mat_<float> depth(const Affine3f& pose) = 0;
     virtual std::vector<Affine3f> getPoses() = 0;
 };
 
@@ -131,15 +131,15 @@ struct SemisphereScene : Scene
         return res;
     }
 
-    Mat depth(Affine3f pose) override
+    Mat_<float> depth(const Affine3f& pose) override
     {
         Mat_<float> frame(frameSize);
         Reprojector reproj(intr);
 
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
 
-        return std::move(frame);
+        return frame;
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/rgbd/test/ocl/test_tsdf.cpp b/modules/rgbd/test/ocl/test_tsdf.cpp
@@ -143,7 +143,7 @@ struct SemisphereScene : Scene
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
 
-        return std::move(frame);
+        return static_cast<Mat>(frame);
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/rgbd/test/test_colored_kinfu.cpp b/modules/rgbd/test/test_colored_kinfu.cpp
@@ -158,8 +158,8 @@ struct Scene
 {
     virtual ~Scene() {}
     static Ptr<Scene> create(int nScene, Size sz, Matx33f _intr, float _depthFactor);
-    virtual Mat depth(Affine3f pose) = 0;
-    virtual Mat rgb(Affine3f pose) = 0;
+    virtual Mat_<float> depth(const Affine3f& pose) = 0;
+    virtual Mat_<Vec3f> rgb(const Affine3f& pose) = 0;
     virtual std::vector<Affine3f> getPoses() = 0;
 };
 
@@ -198,26 +198,26 @@ struct CubeSpheresScene : Scene
         return res;
     }
 
-    Mat depth(Affine3f pose) override
+    Mat_<float> depth(const Affine3f& pose) override
     {
         Mat_<float> frame(frameSize);
         Reprojector reproj(intr);
 
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return frame;
     }
 
-    Mat rgb(Affine3f pose) override
+    Mat_<Vec3f> rgb(const Affine3f& pose) override
     {
         Mat_<Vec3f> frame(frameSize);
         Reprojector reproj(intr);
 
         Range range(0, frame.rows);
         parallel_for_(range, RenderColorInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return frame;
     }
 
     std::vector<Affine3f> getPoses() override
@@ -305,26 +305,26 @@ struct RotatingScene : Scene
         return res;
     }
 
-    Mat depth(Affine3f pose) override
+    Mat_<float> depth(const Affine3f& pose) override
     {
         Mat_<float> frame(frameSize);
         Reprojector reproj(intr);
 
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<RotatingScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return frame;
     }
 
-    Mat rgb(Affine3f pose) override
+    Mat_<Vec3f> rgb(const Affine3f& pose) override
     {
         Mat_<Vec3f> frame(frameSize);
         Reprojector reproj(intr);
 
         Range range(0, frame.rows);
         parallel_for_(range, RenderColorInvoker<RotatingScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return frame;
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/rgbd/test/test_kinfu.cpp b/modules/rgbd/test/test_kinfu.cpp
@@ -141,7 +141,7 @@ struct CubeSpheresScene : Scene
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return static_cast<Mat>(frame);
     }
 
     std::vector<Affine3f> getPoses() override
@@ -237,7 +237,7 @@ struct RotatingScene : Scene
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<RotatingScene>(frame, pose, reproj, depthFactor));
 
-        return std::move(frame);
+        return static_cast<Mat>(frame);
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/rgbd/test/test_tsdf.cpp b/modules/rgbd/test/test_tsdf.cpp
@@ -140,7 +140,7 @@ struct SemisphereScene : Scene
         Range range(0, frame.rows);
         parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
 
-        return std::move(frame);
+        return static_cast<Mat>(frame);
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/videostab/src/global_motion.cpp b/modules/videostab/src/global_motion.cpp
diff --git a/modules/ximgproc/test/test_sparse_match_interpolator.cpp b/modules/ximgproc/test/test_sparse_match_interpolator.cpp

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ struct Scene`
`91`	`91`	`{`
`92`	`92`	`virtual ~Scene() {}`
`93`	`93`	`static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere);`
`94`		`- virtual Mat depth(Affine3f pose) = 0;`
	`94`	`+ virtual Mat_<float> depth(const Affine3f& pose) = 0;`
`95`	`95`	`virtual std::vector<Affine3f> getPoses() = 0;`
`96`	`96`	`};`
`97`	`97`
`@@ -131,15 +131,15 @@ struct SemisphereScene : Scene`
`131`	`131`	`return res;`
`132`	`132`	`}`
`133`	`133`
`134`		`- Mat depth(Affine3f pose) override`
	`134`	`+ Mat_<float> depth(const Affine3f& pose) override`
`135`	`135`	`{`
`136`	`136`	`Mat_<float> frame(frameSize);`
`137`	`137`	`Reprojector reproj(intr);`
`138`	`138`
`139`	`139`	`Range range(0, frame.rows);`
`140`	`140`	`parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));`
`141`	`141`
`142`		`- return std::move(frame);`
	`142`	`+ return frame;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`std::vector<Affine3f> getPoses() override`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ struct SemisphereScene : Scene`
`143`	`143`	`Range range(0, frame.rows);`
`144`	`144`	`parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));`
`145`	`145`
`146`		`- return std::move(frame);`
	`146`	`+ return static_cast<Mat>(frame);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`std::vector<Affine3f> getPoses() override`
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ struct Scene`
`158`	`158`	`{`
`159`	`159`	`virtual ~Scene() {}`
`160`	`160`	`static Ptr<Scene> create(int nScene, Size sz, Matx33f _intr, float _depthFactor);`
`161`		`- virtual Mat depth(Affine3f pose) = 0;`
`162`		`- virtual Mat rgb(Affine3f pose) = 0;`
	`161`	`+ virtual Mat_<float> depth(const Affine3f& pose) = 0;`
	`162`	`+ virtual Mat_<Vec3f> rgb(const Affine3f& pose) = 0;`
`163`	`163`	`virtual std::vector<Affine3f> getPoses() = 0;`
`164`	`164`	`};`
`165`	`165`
`@@ -198,26 +198,26 @@ struct CubeSpheresScene : Scene`
`198`	`198`	`return res;`
`199`	`199`	`}`
`200`	`200`
`201`		`- Mat depth(Affine3f pose) override`
	`201`	`+ Mat_<float> depth(const Affine3f& pose) override`
`202`	`202`	`{`
`203`	`203`	`Mat_<float> frame(frameSize);`
`204`	`204`	`Reprojector reproj(intr);`
`205`	`205`
`206`	`206`	`Range range(0, frame.rows);`
`207`	`207`	`parallel_for_(range, RenderInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));`
`208`	`208`
`209`		`- return std::move(frame);`
	`209`	`+ return frame;`
`210`	`210`	`}`
`211`	`211`
`212`		`- Mat rgb(Affine3f pose) override`
	`212`	`+ Mat_<Vec3f> rgb(const Affine3f& pose) override`
`213`	`213`	`{`
`214`	`214`	`Mat_<Vec3f> frame(frameSize);`
`215`	`215`	`Reprojector reproj(intr);`
`216`	`216`
`217`	`217`	`Range range(0, frame.rows);`
`218`	`218`	`parallel_for_(range, RenderColorInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));`
`219`	`219`
`220`		`- return std::move(frame);`
	`220`	`+ return frame;`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`std::vector<Affine3f> getPoses() override`
`@@ -305,26 +305,26 @@ struct RotatingScene : Scene`
`305`	`305`	`return res;`
`306`	`306`	`}`
`307`	`307`
`308`		`- Mat depth(Affine3f pose) override`
	`308`	`+ Mat_<float> depth(const Affine3f& pose) override`
`309`	`309`	`{`
`310`	`310`	`Mat_<float> frame(frameSize);`
`311`	`311`	`Reprojector reproj(intr);`
`312`	`312`
`313`	`313`	`Range range(0, frame.rows);`
`314`	`314`	`parallel_for_(range, RenderInvoker<RotatingScene>(frame, pose, reproj, depthFactor));`
`315`	`315`
`316`		`- return std::move(frame);`
	`316`	`+ return frame;`
`317`	`317`	`}`
`318`	`318`
`319`		`- Mat rgb(Affine3f pose) override`
	`319`	`+ Mat_<Vec3f> rgb(const Affine3f& pose) override`
`320`	`320`	`{`
`321`	`321`	`Mat_<Vec3f> frame(frameSize);`
`322`	`322`	`Reprojector reproj(intr);`
`323`	`323`
`324`	`324`	`Range range(0, frame.rows);`
`325`	`325`	`parallel_for_(range, RenderColorInvoker<RotatingScene>(frame, pose, reproj, depthFactor));`
`326`	`326`
`327`		`- return std::move(frame);`
	`327`	`+ return frame;`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`std::vector<Affine3f> getPoses() override`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ struct CubeSpheresScene : Scene`
`141`	`141`	`Range range(0, frame.rows);`
`142`	`142`	`parallel_for_(range, RenderInvoker<CubeSpheresScene>(frame, pose, reproj, depthFactor));`
`143`	`143`
`144`		`- return std::move(frame);`
	`144`	`+ return static_cast<Mat>(frame);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`std::vector<Affine3f> getPoses() override`
`@@ -237,7 +237,7 @@ struct RotatingScene : Scene`
`237`	`237`	`Range range(0, frame.rows);`
`238`	`238`	`parallel_for_(range, RenderInvoker<RotatingScene>(frame, pose, reproj, depthFactor));`
`239`	`239`
`240`		`- return std::move(frame);`
	`240`	`+ return static_cast<Mat>(frame);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`std::vector<Affine3f> getPoses() override`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ struct SemisphereScene : Scene`
`140`	`140`	`Range range(0, frame.rows);`
`141`	`141`	`parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));`
`142`	`142`
`143`		`- return std::move(frame);`
	`143`	`+ return static_cast<Mat>(frame);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`std::vector<Affine3f> getPoses() override`