Merge pull request #3737 from asmorkalov:as/ubuntu_2404_warning_fix

asmorkalov · web-flow · commit 70b5d209a85b · 2024-05-15T20:03:55.000+03:00
More warning fixes for Ubuntu 24.04.
diff --git a/modules/intensity_transform/src/bimef.cpp b/modules/intensity_transform/src/bimef.cpp
@@ -226,15 +226,15 @@ static Mat solveLinearEquation(const Mat_<float>& img, Mat_<float>& W_h_, Mat_<f
     Eigen::Map<const Eigen::VectorXf> tin(img_t.ptr<float>(), img_t.rows*img_t.cols);
     Eigen::VectorXf x = cg.solve(tin);
 
-    Mat_<float> tout(img.rows, img.cols);
-    tout.forEach(
+    Mat tout(img.rows, img.cols, CV_32FC1);
+    tout.forEach<float>(
         [&](float &pixel, const int * position) -> void
         {
             pixel = x(position[1]*img.rows + position[0]);
         }
     );
 
-    return std::move(tout);
+    return tout;
 }
 
 static Mat_<float> tsmooth(const Mat_<float>& src, float lambda=0.01f, float sigma=3.0f, float sharpness=0.001f)

Original file line number	Diff line number	Diff line change
`@@ -226,15 +226,15 @@ static Mat solveLinearEquation(const Mat_<float>& img, Mat_<float>& W_h_, Mat_<f`
`226`	`226`	`Eigen::Map<const Eigen::VectorXf> tin(img_t.ptr<float>(), img_t.rows*img_t.cols);`
`227`	`227`	`Eigen::VectorXf x = cg.solve(tin);`
`228`	`228`
`229`		`- Mat_<float> tout(img.rows, img.cols);`
`230`		`- tout.forEach(`
	`229`	`+ Mat tout(img.rows, img.cols, CV_32FC1);`
	`230`	`+ tout.forEach<float>(`
`231`	`231`	`[&](float &pixel, const int * position) -> void`
`232`	`232`	`{`
`233`	`233`	`pixel = x(position[1]*img.rows + position[0]);`
`234`	`234`	`}`
`235`	`235`	`);`
`236`	`236`
`237`		`- return std::move(tout);`
	`237`	`+ return tout;`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`static Mat_<float> tsmooth(const Mat_<float>& src, float lambda=0.01f, float sigma=3.0f, float sharpness=0.001f)`