Merge pull request #20625 from alalek:fix_msvc_warnings

modules/features2d/src/kaze/KAZEFeatures.cpp

@@ -311,7 +311,7 @@ private:
 void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
 {
     int level = 0;
-    float dist = 0.0, smax = 3.0;
+    float smax = 3.0;
     int npoints = 0, id_repeated = 0;
     int left_x = 0, right_x = 0, up_y = 0, down_y = 0;
     bool is_extremum = false, is_repeated = false, is_out = false;
@@ -338,17 +338,24 @@ void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
         for (int j = 0; j < (int)kpts_par_[i].size(); j++)
         {
             level = i + 1;
+            const TEvolution& evolution_level = evolution_[level];
+
             is_extremum = true;
             is_repeated = false;
             is_out = false;
 
+            const KeyPoint& kpts_par_ij = kpts_par_[i][j];
+
             // Check in case we have the same point as maxima in previous evolution levels
-            for (int ik = 0; ik < (int)kpts.size(); ik++) {
-                if (kpts[ik].class_id == level || kpts[ik].class_id == level + 1 || kpts[ik].class_id == level - 1) {
-                    dist = pow(kpts_par_[i][j].pt.x - kpts[ik].pt.x, 2) + pow(kpts_par_[i][j].pt.y - kpts[ik].pt.y, 2);
+            for (int ik = 0; ik < (int)kpts.size(); ik++)
+            {
+                const KeyPoint& kpts_ik = kpts[ik];
+                if (kpts_ik.class_id == level || kpts_ik.class_id == level + 1 || kpts_ik.class_id == level - 1) {
+                    Point2f diff = kpts_par_ij.pt - kpts_ik.pt;
+                    float dist = diff.dot(diff);
 
-                    if (dist < evolution_[level].sigma_size*evolution_[level].sigma_size) {
-                        if (kpts_par_[i][j].response > kpts[ik].response) {
+                    if (dist < evolution_level.sigma_size*evolution_level.sigma_size) {
+                        if (kpts_par_ij.response > kpts_ik.response) {
                             id_repeated = ik;
                             is_repeated = true;
                         }
@@ -363,23 +370,23 @@ void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
 
             if (is_extremum == true) {
                 // Check that the point is under the image limits for the descriptor computation
-                left_x = cvRound(kpts_par_[i][j].pt.x - smax*kpts_par_[i][j].size);
-                right_x = cvRound(kpts_par_[i][j].pt.x + smax*kpts_par_[i][j].size);
-                up_y = cvRound(kpts_par_[i][j].pt.y - smax*kpts_par_[i][j].size);
-                down_y = cvRound(kpts_par_[i][j].pt.y + smax*kpts_par_[i][j].size);
+                left_x = cvRound(kpts_par_ij.pt.x - smax*kpts_par_ij.size);
+                right_x = cvRound(kpts_par_ij.pt.x + smax*kpts_par_ij.size);
+                up_y = cvRound(kpts_par_ij.pt.y - smax*kpts_par_ij.size);
+                down_y = cvRound(kpts_par_ij.pt.y + smax*kpts_par_ij.size);
 
-                if (left_x < 0 || right_x >= evolution_[level].Ldet.cols ||
-                    up_y < 0 || down_y >= evolution_[level].Ldet.rows) {
+                if (left_x < 0 || right_x >= evolution_level.Ldet.cols ||
+                    up_y < 0 || down_y >= evolution_level.Ldet.rows) {
                     is_out = true;
                 }
 
                 if (is_out == false) {
                     if (is_repeated == false) {
-                        kpts.push_back(kpts_par_[i][j]);
+                        kpts.push_back(kpts_par_ij);
                         npoints++;
                     }
                     else {
-                        kpts[id_repeated] = kpts_par_[i][j];
+                        kpts[id_repeated] = kpts_par_ij;
                     }
                 }
             }

modules/photo/src/contrast_preserve.hpp

@@ -358,9 +358,9 @@ void Decolor::grayImContruct(vector <double> &wei, const Mat &img, Mat &Gray) co
                 {
                     for(int i = 0;i<h;i++)
                         for(int j=0;j<w;j++)
-                            Gray.at<float>(i,j)=Gray.at<float>(i,j) +
+                            Gray.at<float>(i,j)=static_cast<float>(Gray.at<float>(i,j) +
                                 static_cast<float>(wei[kk])*pow(rgb_channel[2].at<float>(i,j),r)*pow(rgb_channel[1].at<float>(i,j),g)*
-                                pow(rgb_channel[0].at<float>(i,j),b);
+                                pow(rgb_channel[0].at<float>(i,j),b));
 
                     kk=kk+1;
                 }

modules/superres/src/btv_l1.cpp

@@ -356,7 +356,7 @@ namespace
         for (int m = 0, ind = 0; m <= ksize; ++m)
         {
             for (int l = ksize; l + m >= 0; --l, ++ind)
-                btvWeights[ind] = pow(alpha_f, std::abs(m) + std::abs(l));
+                btvWeights[ind] = static_cast<float>(pow(alpha_f, std::abs(m) + std::abs(l)));
         }
     }
 

samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp

@@ -62,7 +62,7 @@ int main( int argc, char** argv )
         {
             float lambda_1 = myHarris_dst.at<Vec6f>(i, j)[0];
             float lambda_2 = myHarris_dst.at<Vec6f>(i, j)[1];
-            Mc.at<float>(i, j) = lambda_1*lambda_2 - 0.04f*pow( ( lambda_1 + lambda_2 ), 2 );
+            Mc.at<float>(i, j) = lambda_1*lambda_2 - 0.04f*((lambda_1 + lambda_2) * (lambda_1 + lambda_2));
         }
     }