C++ port made more compatible with uSTL (no functional changes).

[zxing.git] / cpp / core / src / zxing / qrcode / detector / QREdgeDetector.cpp

diff --git a/cpp/core/src/zxing/qrcode/detector/QREdgeDetector.cpp b/cpp/core/src/zxing/qrcode/detector/QREdgeDetector.cpp
index 18affe6..7566fb5 100644 (file)
--- a/cpp/core/src/zxing/qrcode/detector/QREdgeDetector.cpp
+++ b/cpp/core/src/zxing/qrcode/detector/QREdgeDetector.cpp
@@ -20,6 +20,7 @@
 \r
 #include <zxing/qrcode/detector/QREdgeDetector.h>\r
 #include <zxing/common/EdgeDetector.h>\r
+#include <cstdlib>\r
 \r
 using namespace std;\r
 \r
@@ -113,7 +114,7 @@ Point QREdgeDetector::endOfReverseBlackWhiteBlackRun(const BitMatrix& image, Poi
   int toX = (int)to.x;\r
   int toY = (int)to.y;\r
 \r
-  bool steep = abs(toY - fromY) > abs(toX - fromX);\r
+  bool steep = labs(toY - fromY) > labs(toX - fromX);\r
   if (steep) {\r
     int temp = fromX;\r
     fromX = fromY;\r
@@ -123,8 +124,8 @@ Point QREdgeDetector::endOfReverseBlackWhiteBlackRun(const BitMatrix& image, Poi
     toY = temp;\r
   }\r
 \r
-  int dx = abs(toX - fromX);\r
-  int dy = abs(toY - fromY);\r
+  int dx = labs(toX - fromX);\r
+  int dy = labs(toY - fromY);\r
   int error = -dx >> 1;\r
   int ystep = fromY < toY ? -1 : 1;\r
   int xstep = fromX < toX ? -1 : 1;\r