X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fcommon%2Fdetector%2FMonochromeRectangleDetector.java;h=b80d59a68b8c993c7706408a3140479035f3b61f;hb=e45d2cc9c473aa6afdf28ace16fa626b0d67c16f;hp=63240d0a4936a943b8c9d4a2135dfd96c4bc47e9;hpb=f1954bd1080850658b65fb15bc5274347f57ce1c;p=zxing.git diff --git a/core/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java b/core/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java index 63240d0a..b80d59a6 100644 --- a/core/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java +++ b/core/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java @@ -21,7 +21,6 @@ import com.google.zxing.ReaderException; import com.google.zxing.ResultPoint; import com.google.zxing.BlackPointEstimationMethod; import com.google.zxing.common.BitArray; -import com.google.zxing.common.GenericResultPoint; /** *

A somewhat generic detector that looks for a barcode-like rectangular region within an image. @@ -122,21 +121,21 @@ public final class MonochromeRectangleDetector { if (lastRange[0] < centerJ) { if (lastRange[1] > centerJ) { // straddle, choose one or the other based on direction - return new GenericResultPoint(di > 0 ? lastRange[0] : lastRange[1], lastI); + return new ResultPoint(di > 0 ? lastRange[0] : lastRange[1], lastI); } - return new GenericResultPoint(lastRange[0], lastI); + return new ResultPoint(lastRange[0], lastI); } else { - return new GenericResultPoint(lastRange[1], lastI); + return new ResultPoint(lastRange[1], lastI); } } else { int lastJ = j - dj; if (lastRange[0] < centerI) { if (lastRange[1] > centerI) { - return new GenericResultPoint(lastJ, dj < 0 ? lastRange[0] : lastRange[1]); + return new ResultPoint(lastJ, dj < 0 ? lastRange[0] : lastRange[1]); } - return new GenericResultPoint(lastJ, lastRange[0]); + return new ResultPoint(lastJ, lastRange[0]); } else { - return new GenericResultPoint(lastJ, lastRange[1]); + return new ResultPoint(lastJ, lastRange[1]); } } }