X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fqrcode%2Fdetector%2FDetector.java;fp=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fqrcode%2Fdetector%2FDetector.java;h=9666b9da273168c4fb869a95469b5cb972f1da90;hb=e45d2cc9c473aa6afdf28ace16fa626b0d67c16f;hp=a2aabdd84d2fcc9c49323a2aa3d9f646dc4b90c4;hpb=f1954bd1080850658b65fb15bc5274347f57ce1c;p=zxing.git diff --git a/core/src/com/google/zxing/qrcode/detector/Detector.java b/core/src/com/google/zxing/qrcode/detector/Detector.java index a2aabdd8..9666b9da 100644 --- a/core/src/com/google/zxing/qrcode/detector/Detector.java +++ b/core/src/com/google/zxing/qrcode/detector/Detector.java @@ -22,7 +22,6 @@ import com.google.zxing.ReaderException; import com.google.zxing.ResultPoint; import com.google.zxing.common.BitMatrix; import com.google.zxing.common.DetectorResult; -import com.google.zxing.common.GenericResultPoint; import com.google.zxing.common.GridSampler; import com.google.zxing.qrcode.decoder.Version; @@ -176,8 +175,8 @@ public final class Detector { ResultPoint topRight, ResultPoint bottomLeft, float moduleSize) throws ReaderException { - int tltrCentersDimension = round(GenericResultPoint.distance(topLeft, topRight) / moduleSize); - int tlblCentersDimension = round(GenericResultPoint.distance(topLeft, bottomLeft) / moduleSize); + int tltrCentersDimension = round(ResultPoint.distance(topLeft, topRight) / moduleSize); + int tlblCentersDimension = round(ResultPoint.distance(topLeft, bottomLeft) / moduleSize); int dimension = ((tltrCentersDimension + tlblCentersDimension) >> 1) + 7; switch (dimension & 0x03) { // mod 4 case 0: