Fixed warnings produced by clang-9.0.0

mshabunin · mshabunin · commit 83fc27cb99db · 2019-01-30T15:14:15.000+03:00
diff --git a/modules/cvv/src/impl/call.hpp b/modules/cvv/src/impl/call.hpp
@@ -101,9 +101,6 @@ class Call
 	Call(const Call &) = default;
 	Call(Call &&) = default;
 
-	Call &operator=(const Call &) = default;
-	Call &operator=(Call &&) = default;
-
 	impl::CallMetaData metaData_;
 	size_t id;
 	QString calltype;
diff --git a/modules/face/src/facemarkLBF.cpp b/modules/face/src/facemarkLBF.cpp
@@ -633,7 +633,7 @@ Mat FacemarkLBFImpl::BBox::project(const Mat &shape) const {
         res(i, 0) = (shape_(i, 0) - x_center) / x_scale;
         res(i, 1) = (shape_(i, 1) - y_center) / y_scale;
     }
-    return res;
+    return std::move(res);
 }
 
 // Project relative shape to absolute shape binding to this bbox
@@ -644,7 +644,7 @@ Mat FacemarkLBFImpl::BBox::reproject(const Mat &shape) const {
         res(i, 0) = shape_(i, 0)*x_scale + x_center;
         res(i, 1) = shape_(i, 1)*y_scale + y_center;
     }
-    return res;
+    return std::move(res);
 }
 
 Mat FacemarkLBFImpl::getMeanShape(std::vector<Mat> &gt_shapes, std::vector<BBox> &bboxes) {
@@ -1005,7 +1005,7 @@ Mat FacemarkLBFImpl::RandomForest::generateLBF(Mat &img, Mat &current_shape, BBo
             lbf_feat(i*trees_n + j) = (i*trees_n + j)*base + code;
         }
     }
-    return lbf_feat;
+    return std::move(lbf_feat);
 }
 
 void FacemarkLBFImpl::RandomForest::write(FileStorage fs, int k) {
@@ -1347,7 +1347,7 @@ Mat FacemarkLBFImpl::Regressor::globalRegressionPredict(const Mat &lbf, int stag
         for (int j = 0; j < lbf.cols; j++) y += w_ptr[lbf_ptr[j]];
         delta_shape(i, 1) = y;
     }
-    return delta_shape;
+    return std::move(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
@@ -106,7 +106,7 @@ struct MACEImpl CV_FINAL : MACE {
         complexInput.copyTo(dftImg(Rect(0,0,IMGSIZE,IMGSIZE)));
 
         dft(dftImg, dftImg);
-        return dftImg;
+        return std::move(dftImg);
     }
 
 
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
@@ -603,7 +603,7 @@ class WindowSceneImpl : public WindowScene
         node.setScale(value[0], value[1], value[2]);
     }
 
-    void getEntityProperty(const String& name, int prop, OutputArray value)
+    void getEntityProperty(const String& name, int prop, OutputArray value) CV_OVERRIDE
     {
         SceneNode& node = _getSceneNode(sceneMgr, name);
         switch(prop)
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 frame;
+        return std::move(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 frame;
+        return std::move(frame);
     }
 
     std::vector<Affine3f> getPoses() override
diff --git a/modules/sfm/src/numeric.cpp b/modules/sfm/src/numeric.cpp
@@ -140,7 +140,7 @@ skewMat( const Mat_<T> &x )
           x(2),    0 , -x(0),
          -x(1),  x(0),    0;
 
-  return skew;
+  return std::move(skew);
 }
 
 Mat
diff --git a/modules/videostab/src/global_motion.cpp b/modules/videostab/src/global_motion.cpp
@@ -113,7 +113,7 @@ static Mat normalizePoints(int npoints, Point2f *points)
     T(0,0) = T(1,1) = s;
     T(0,2) = -cx*s;
     T(1,2) = -cy*s;
-    return T;
+    return std::move(T);
 }
 
 
@@ -138,7 +138,7 @@ static Mat estimateGlobMotionLeastSquaresTranslation(
         *rmse = std::sqrt(*rmse / npoints);
     }
 
-    return M;
+    return std::move(M);
 }
 
 
@@ -219,7 +219,7 @@ static Mat estimateGlobMotionLeastSquaresRotation(
         *rmse = std::sqrt(*rmse / npoints);
     }
 
-    return M;
+    return std::move(M);
 }
 
 static Mat  estimateGlobMotionLeastSquaresRigid(
@@ -273,7 +273,7 @@ static Mat  estimateGlobMotionLeastSquaresRigid(
         *rmse = std::sqrt(*rmse / npoints);
     }
 
-    return M;
+    return std::move(M);
 }
 
 
@@ -484,7 +484,7 @@ Mat estimateGlobalMotionRansac(
     if (ninliers)
         *ninliers = ninliersMax;
 
-    return bestM;
+    return std::move(bestM);
 }
 
 
@@ -527,7 +527,7 @@ Mat MotionEstimatorRansacL2::estimate(InputArray points0, InputArray points1, bo
         if (ok) *ok = false;
     }
 
-    return M;
+    return std::move(M);
 }
 
 
@@ -681,7 +681,7 @@ Mat FromFileMotionReader::estimate(const Mat &/*frame0*/, const Mat &/*frame1*/,
           >> M(1,0) >> M(1,1) >> M(1,2)
           >> M(2,0) >> M(2,1) >> M(2,2) >> ok_;
     if (ok) *ok = ok_;
-    return M;
+    return std::move(M);
 }
 
 
@@ -701,7 +701,7 @@ Mat ToFileMotionWriter::estimate(const Mat &frame0, const Mat &frame1, bool *ok)
           << M(1,0) << " " << M(1,1) << " " << M(1,2) << " "
           << M(2,0) << " " << M(2,1) << " " << M(2,2) << " " << ok_ << std::endl;
     if (ok) *ok = ok_;
-    return M;
+    return std::move(M);
 }
 
 
diff --git a/modules/ximgproc/samples/colorize.cpp b/modules/ximgproc/samples/colorize.cpp
@@ -338,11 +338,11 @@ void drawTrajectoryByReference(cv::Mat& img)
 
                 if(drawByReference)
                 {
-                    cv::circle(img, cv::Point2d(x, y), 0.1, cv::Scalar(blue, green, red), -1);
+                    cv::circle(img, cv::Point2d(x, y), 1, cv::Scalar(blue, green, red), -1);
                 }
                 else
                 {
-                    cv::circle(img, cv::Point2d(x, y), 0.1, cv::Scalar(draw_b, draw_g, draw_r), -1);
+                    cv::circle(img, cv::Point2d(x, y), 1, cv::Scalar(draw_b, draw_g, draw_r), -1);
                 }
             }
         }
diff --git a/modules/ximgproc/test/test_sparse_match_interpolator.cpp b/modules/ximgproc/test/test_sparse_match_interpolator.cpp
@@ -20,12 +20,12 @@ Mat readOpticalFlow( const String& path )
     Mat_<Point2f> flow;
     std::ifstream file(path.c_str(), std::ios_base::binary);
     if ( !file.good() )
-        return flow; // no file - return empty matrix
+        return std::move(flow); // no file - return empty matrix
 
     float tag;
     file.read((char*) &tag, sizeof(float));
     if ( tag != FLOW_TAG_FLOAT )
-        return flow;
+        return std::move(flow);
 
     int width, height;
 
@@ -44,14 +44,14 @@ Mat readOpticalFlow( const String& path )
             if ( !file.good() )
             {
                 flow.release();
-                return flow;
+                return std::move(flow);
             }
 
             flow(i, j) = u;
         }
     }
     file.close();
-    return flow;
+    return std::move(flow);
 }
 
 CV_ENUM(GuideTypes, CV_8UC1, CV_8UC3)

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ Mat FacemarkLBFImpl::BBox::project(const Mat &shape) const {`
`633`	`633`	`res(i, 0) = (shape_(i, 0) - x_center) / x_scale;`
`634`	`634`	`res(i, 1) = (shape_(i, 1) - y_center) / y_scale;`
`635`	`635`	`}`
`636`		`- return res;`
	`636`	`+ return std::move(res);`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`// Project relative shape to absolute shape binding to this bbox`
`@@ -644,7 +644,7 @@ Mat FacemarkLBFImpl::BBox::reproject(const Mat &shape) const {`
`644`	`644`	`res(i, 0) = shape_(i, 0)*x_scale + x_center;`
`645`	`645`	`res(i, 1) = shape_(i, 1)*y_scale + y_center;`
`646`	`646`	`}`
`647`		`- return res;`
	`647`	`+ return std::move(res);`
`648`	`648`	`}`
`649`	`649`
`650`	`650`	`Mat FacemarkLBFImpl::getMeanShape(std::vector<Mat> &gt_shapes, std::vector<BBox> &bboxes) {`
`@@ -1005,7 +1005,7 @@ Mat FacemarkLBFImpl::RandomForest::generateLBF(Mat &img, Mat &current_shape, BBo`
`1005`	`1005`	`lbf_feat(itrees_n + j) = (itrees_n + j)*base + code;`
`1006`	`1006`	`}`
`1007`	`1007`	`}`
`1008`		`- return lbf_feat;`
	`1008`	`+ return std::move(lbf_feat);`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`	`1011`	`void FacemarkLBFImpl::RandomForest::write(FileStorage fs, int k) {`
`@@ -1347,7 +1347,7 @@ Mat FacemarkLBFImpl::Regressor::globalRegressionPredict(const Mat &lbf, int stag`
`1347`	`1347`	`for (int j = 0; j < lbf.cols; j++) y += w_ptr[lbf_ptr[j]];`
`1348`	`1348`	`delta_shape(i, 1) = y;`
`1349`	`1349`	`}`
`1350`		`- return delta_shape;`
	`1350`	`+ return std::move(delta_shape);`
`1351`	`1351`	`} // Regressor::globalRegressionPredict`
`1352`	`1352`
`1353`	`1353`	`Mat FacemarkLBFImpl::Regressor::predict(Mat &img, BBox &bbox) {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ struct MACEImpl CV_FINAL : MACE {`
`106`	`106`	`complexInput.copyTo(dftImg(Rect(0,0,IMGSIZE,IMGSIZE)));`
`107`	`107`
`108`	`108`	`dft(dftImg, dftImg);`
`109`		`- return dftImg;`
	`109`	`+ return std::move(dftImg);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ class WindowSceneImpl : public WindowScene`
`603`	`603`	`node.setScale(value[0], value[1], value[2]);`
`604`	`604`	`}`
`605`	`605`
`606`		`- void getEntityProperty(const String& name, int prop, OutputArray value)`
	`606`	`+ void getEntityProperty(const String& name, int prop, OutputArray value) CV_OVERRIDE`
`607`	`607`	`{`
`608`	`608`	`SceneNode& node = _getSceneNode(sceneMgr, name);`
`609`	`609`	`switch(prop)`
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 frame;`
	`144`	`+ return std::move(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 frame;`
	`240`	`+ return std::move(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 @@ skewMat( const Mat_<T> &x )`
`140`	`140`	`x(2), 0 , -x(0),`
`141`	`141`	`-x(1), x(0), 0;`
`142`	`142`
`143`		`- return skew;`
	`143`	`+ return std::move(skew);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`Mat`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ static Mat normalizePoints(int npoints, Point2f *points)`
`113`	`113`	`T(0,0) = T(1,1) = s;`
`114`	`114`	`T(0,2) = -cx*s;`
`115`	`115`	`T(1,2) = -cy*s;`
`116`		`- return T;`
	`116`	`+ return std::move(T);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`
`@@ -138,7 +138,7 @@ static Mat estimateGlobMotionLeastSquaresTranslation(`
`138`	`138`	`rmse = std::sqrt(rmse / npoints);`
`139`	`139`	`}`
`140`	`140`
`141`		`- return M;`
	`141`	`+ return std::move(M);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`
`@@ -219,7 +219,7 @@ static Mat estimateGlobMotionLeastSquaresRotation(`
`219`	`219`	`rmse = std::sqrt(rmse / npoints);`
`220`	`220`	`}`
`221`	`221`
`222`		`- return M;`
	`222`	`+ return std::move(M);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`static Mat estimateGlobMotionLeastSquaresRigid(`
`@@ -273,7 +273,7 @@ static Mat estimateGlobMotionLeastSquaresRigid(`
`273`	`273`	`rmse = std::sqrt(rmse / npoints);`
`274`	`274`	`}`
`275`	`275`
`276`		`- return M;`
	`276`	`+ return std::move(M);`
`277`	`277`	`}`
`278`	`278`
`279`	`279`
`@@ -484,7 +484,7 @@ Mat estimateGlobalMotionRansac(`
`484`	`484`	`if (ninliers)`
`485`	`485`	`*ninliers = ninliersMax;`
`486`	`486`
`487`		`- return bestM;`
	`487`	`+ return std::move(bestM);`
`488`	`488`	`}`
`489`	`489`
`490`	`490`
`@@ -527,7 +527,7 @@ Mat MotionEstimatorRansacL2::estimate(InputArray points0, InputArray points1, bo`
`527`	`527`	`if (ok) *ok = false;`
`528`	`528`	`}`
`529`	`529`
`530`		`- return M;`
	`530`	`+ return std::move(M);`
`531`	`531`	`}`
`532`	`532`
`533`	`533`
`@@ -681,7 +681,7 @@ Mat FromFileMotionReader::estimate(const Mat &/frame0/, const Mat &/frame1/,`
`681`	`681`	`>> M(1,0) >> M(1,1) >> M(1,2)`
`682`	`682`	`>> M(2,0) >> M(2,1) >> M(2,2) >> ok_;`
`683`	`683`	`if (ok) *ok = ok_;`
`684`		`- return M;`
	`684`	`+ return std::move(M);`
`685`	`685`	`}`
`686`	`686`
`687`	`687`
`@@ -701,7 +701,7 @@ Mat ToFileMotionWriter::estimate(const Mat &frame0, const Mat &frame1, bool *ok)`
`701`	`701`	`<< M(1,0) << " " << M(1,1) << " " << M(1,2) << " "`
`702`	`702`	`<< M(2,0) << " " << M(2,1) << " " << M(2,2) << " " << ok_ << std::endl;`
`703`	`703`	`if (ok) *ok = ok_;`
`704`		`- return M;`
	`704`	`+ return std::move(M);`
`705`	`705`	`}`
`706`	`706`
`707`	`707`
Original file line number	Diff line number	Diff line change
`@@ -338,11 +338,11 @@ void drawTrajectoryByReference(cv::Mat& img)`
`338`	`338`
`339`	`339`	`if(drawByReference)`
`340`	`340`	`{`
`341`		`- cv::circle(img, cv::Point2d(x, y), 0.1, cv::Scalar(blue, green, red), -1);`
	`341`	`+ cv::circle(img, cv::Point2d(x, y), 1, cv::Scalar(blue, green, red), -1);`
`342`	`342`	`}`
`343`	`343`	`else`
`344`	`344`	`{`
`345`		`- cv::circle(img, cv::Point2d(x, y), 0.1, cv::Scalar(draw_b, draw_g, draw_r), -1);`
	`345`	`+ cv::circle(img, cv::Point2d(x, y), 1, cv::Scalar(draw_b, draw_g, draw_r), -1);`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ Mat readOpticalFlow( const String& path )`
`20`	`20`	`Mat_<Point2f> flow;`
`21`	`21`	`std::ifstream file(path.c_str(), std::ios_base::binary);`
`22`	`22`	`if ( !file.good() )`
`23`		`- return flow; // no file - return empty matrix`
	`23`	`+ return std::move(flow); // no file - return empty matrix`
`24`	`24`
`25`	`25`	`float tag;`
`26`	`26`	`file.read((char*) &tag, sizeof(float));`
`27`	`27`	`if ( tag != FLOW_TAG_FLOAT )`
`28`		`- return flow;`
	`28`	`+ return std::move(flow);`
`29`	`29`
`30`	`30`	`int width, height;`
`31`	`31`
`@@ -44,14 +44,14 @@ Mat readOpticalFlow( const String& path )`
`44`	`44`	`if ( !file.good() )`
`45`	`45`	`{`
`46`	`46`	`flow.release();`
`47`		`- return flow;`
	`47`	`+ return std::move(flow);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`flow(i, j) = u;`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`file.close();`
`54`		`- return flow;`
	`54`	`+ return std::move(flow);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`CV_ENUM(GuideTypes, CV_8UC1, CV_8UC3)`