From aa73dafbbb91c729e1a22042a046ca21145eba50 Mon Sep 17 00:00:00 2001
From: Juan Manuel Perez <juanmanpr@gmail.com>
Date: Wed, 25 Sep 2013 00:09:59 +0200
Subject: [PATCH] 2 Compile error fix for Win

---
 modules/shape/src/emdL1.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/shape/src/emdL1.cpp b/modules/shape/src/emdL1.cpp
index c07e92f34f..db947b5282 100644
--- a/modules/shape/src/emdL1.cpp
+++ b/modules/shape/src/emdL1.cpp
@@ -286,7 +286,7 @@ bool EmdL1::greedySolution2()
     for(r=0; r<binsDim1; r++)
     {
         dFlow = D[r][c];
-        bUpward = (r<binsDim1-1) && (fabs(dFlow+d2s[c+1]) > fabs(dFlow+d1s[r+1]));	// Move upward or right
+        bUpward = (r<binsDim1-1) && (std::abs(dFlow+d2s[c+1]) > std::abs(dFlow+d1s[r+1]));	// Move upward or right
 
         // modify basic variables, record BV and related values
         if(bUpward)
@@ -308,7 +308,7 @@ bool EmdL1::greedySolution2()
             d2s[c+1] += dFlow;		// auxilary matrix maintanence
         }
         pBV->pParent->pChild = pBV;
-        pBV->flow = fabs(dFlow);
+        pBV->flow = std::abs(dFlow);
         pBV->iDir = dFlow>0;		// 1:outward, 0:inward
     }
 
@@ -320,7 +320,7 @@ bool EmdL1::greedySolution2()
         pBV = &(m_EdgesUp[r][c]);
         D[r+1][c] += dFlow;		// auxilary matrix maintanence
         pBV->pParent->pChild= pBV;
-        pBV->flow = fabs(dFlow);
+        pBV->flow = std::abs(dFlow);
         pBV->iDir = dFlow>0;		// 1:outward, 0:inward
     }
     return true;
@@ -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(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;
+                f1 = (i1<(binsDim1-1))?std::abs(dFlow+d1s[i1+1]):VHIGH;
+                f2 = (i2<(binsDim2-1))?std::abs(dFlow+d2s[i2+1]):VHIGH;
+                f3 = (i3<(binsDim3-1))?std::abs(dFlow+d3s[i3+1]):VHIGH;
 
                 if(f1<f2 && f1<f3)
                 {
@@ -422,7 +422,7 @@ bool EmdL1::greedySolution3()
                     d3s[i3+1] += dFlow;
                 }
 
-                pBV->flow = fabs(dFlow);
+                pBV->flow = std::abs(dFlow);
                 pBV->iDir = dFlow>0; // 1:outward, 0:inward
                 pBV->pParent->pChild= pBV;
             }