Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-08-28 21:30:28 +00:00
parent 56d0d5986f 1259a474ba
commit 4c05a697fa
10 changed files with 159 additions and 82 deletions
@@ -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));
        }
    }