Fixed things broken in the last commit.

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

diff --git a/cpp/core/src/zxing/qrcode/detector/Detector.cpp b/cpp/core/src/zxing/qrcode/detector/Detector.cpp
index 9b46188..a50424c 100644 (file)
--- a/cpp/core/src/zxing/qrcode/detector/Detector.cpp
+++ b/cpp/core/src/zxing/qrcode/detector/Detector.cpp
@@ -201,7 +201,7 @@ float Detector::sizeOfBlackWhiteBlackRunBothWays(int fromX, int fromY, int toX,
 float Detector::sizeOfBlackWhiteBlackRun(int fromX, int fromY, int toX, int toY) {\r
   // Mild variant of Bresenham's algorithm;\r
   // see http://en.wikipedia.org/wiki/Bresenham's_line_algorithm\r
-  bool steep = labs(toY - fromY) > labs(toX - fromX);\r
+  bool steep = abs(toY - fromY) > abs(toX - fromX);\r
   if (steep) {\r
     int temp = fromX;\r
     fromX = fromY;\r
@@ -211,8 +211,8 @@ float Detector::sizeOfBlackWhiteBlackRun(int fromX, int fromY, int toX, int toY)
     toY = temp;\r
   }\r
 \r
-  int dx = labs(toX - fromX);\r
-  int dy = labs(toY - fromY);\r
+  int dx = abs(toX - fromX);\r
+  int dy = abs(toY - fromY);\r
   int error = -dx >> 1;\r
   int ystep = fromY < toY ? 1 : -1;\r
   int xstep = fromX < toX ? 1 : -1;\r