Compile error fix for Win
authorJuan Manuel Perez <juanmanpr@gmail.com>
Tue, 24 Sep 2013 21:05:29 +0000 (23:05 +0200)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 30 Sep 2013 10:39:17 +0000 (14:39 +0400)
modules/shape/src/emdL1.cpp

index 1c09ae4..c07e92f 100644 (file)
@@ -393,9 +393,9 @@ bool EmdL1::greedySolution3()
 
                 //- determine which direction to move, either right or upward
                 dFlow = D[i1][i2][i3];
-                f1 = i1<(binsDim1-1)?(float)fabs(float(dFlow+d1s[i1+1])):VHIGH;
-                f2 = i2<(binsDim2-1)?(float)fabs(float(dFlow+d2s[i2+1])):VHIGH;
-                f3 = i3<(binsDim3-1)?(float)fabs(float(dFlow+d3s[i3+1])):VHIGH;
+                f1 = i1<(binsDim1-1)?(float)fabs(double(dFlow+d1s[i1+1])):VHIGH;
+                f2 = i2<(binsDim2-1)?(float)fabs(double(dFlow+d2s[i2+1])):VHIGH;
+                f3 = i3<(binsDim3-1)?(float)fabs(double(dFlow+d3s[i3+1])):VHIGH;
 
                 if(f1<f2 && f1<f3)
                 {