build: fix MSVS2010

alalek · alalek · commit e615fafe2de1 · 2017-10-08T23:32:22.000+03:00
diff --git a/modules/dnn/src/layers/lp_normalize_layer.cpp b/modules/dnn/src/layers/lp_normalize_layer.cpp
@@ -53,8 +53,8 @@ class LPNormalizeLayerImpl : public LPNormalizeLayer
             norm = cv::norm(*inputs[0], NORM_L2);
         else
         {
-            pow(abs(*inputs[0]), pnorm, internals[0]);
-            norm = pow(sum(internals[0])[0], 1.0f / pnorm);
+            cv::pow(abs(*inputs[0]), pnorm, internals[0]);
+            norm = pow((float)sum(internals[0])[0], 1.0f / pnorm);
         }
         multiply(*inputs[0], 1.0f / (norm + epsilon), outputs[0]);
     }
diff --git a/modules/imgproc/src/shapedescr.cpp b/modules/imgproc/src/shapedescr.cpp
@@ -593,8 +593,8 @@ cv::RotatedRect cv::fitEllipseAMS( InputArray _points )
 
             x0 = p1/l3 + c.x;
             y0 = p2/l3 + c.y;
-            a = sqrt(2)*sqrt((u1 - 4.0*u2)/((l1 - l2)*l3));
-            b = sqrt(2)*sqrt(-1.0*((u1 - 4.0*u2)/((l1 + l2)*l3)));
+            a = std::sqrt(2.)*sqrt((u1 - 4.0*u2)/((l1 - l2)*l3));
+            b = std::sqrt(2.)*sqrt(-1.0*((u1 - 4.0*u2)/((l1 + l2)*l3)));
             if (pVec(1)  == 0) {
                 if (pVec(0)  < pVec(2) ) {
                     theta = 0;
@@ -746,8 +746,8 @@ cv::RotatedRect cv::fitEllipseDirect( InputArray _points )
 
         x0 = p1/l3 + c.x;
         y0 = p2/l3 + c.y;
-        a = sqrt(2)*sqrt((u1 - 4.0*u2)/((l1 - l2)*l3));
-        b = sqrt(2)*sqrt(-1.0*((u1 - 4.0*u2)/((l1 + l2)*l3)));
+        a = sqrt(2.)*sqrt((u1 - 4.0*u2)/((l1 - l2)*l3));
+        b = sqrt(2.)*sqrt(-1.0*((u1 - 4.0*u2)/((l1 + l2)*l3)));
         if (pVec(1)  == 0) {
             if (pVec(0)  < pVec(2) ) {
                 theta = 0;

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ class LPNormalizeLayerImpl : public LPNormalizeLayer`
`53`	`53`	`norm = cv::norm(*inputs[0], NORM_L2);`
`54`	`54`	`else`
`55`	`55`	`{`
`56`		`- pow(abs(*inputs[0]), pnorm, internals[0]);`
`57`		`- norm = pow(sum(internals[0])[0], 1.0f / pnorm);`
	`56`	`+ cv::pow(abs(*inputs[0]), pnorm, internals[0]);`
	`57`	`+ norm = pow((float)sum(internals[0])[0], 1.0f / pnorm);`
`58`	`58`	`}`
`59`	`59`	`multiply(*inputs[0], 1.0f / (norm + epsilon), outputs[0]);`
`60`	`60`	`}`