ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 12:52:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

move all Result to RXingResult

Browse Source
This commit is contained in:
Henry Schimke
2022-08-20 12:12:30 -05:00
parent 9f72478dc8
commit 90ace738b7
149 changed files with 1658 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qrcode/detector/AlignmentPattern.java
View File

@@ -16,7 +16,7 @@
package com.google.zxing.qrcode.detector;
import com.google.zxing.ResultPoint;
import com.google.zxing.RXingResultPoint;
/**
* <p>Encapsulates an alignment pattern, which are the smaller square patterns found in
@@ -24,7 +24,7 @@ import com.google.zxing.ResultPoint;
*
* @author Sean Owen
*/
public final class AlignmentPattern extends ResultPoint {
public final class AlignmentPattern extends RXingResultPoint {
private final float estimatedModuleSize;

8
src/qrcode/detector/AlignmentPatternFinder.java
View File

@@ -17,7 +17,7 @@
package com.google.zxing.qrcode.detector;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.RXingResultPointCallback;
import com.google.zxing.common.BitMatrix;
import java.util.ArrayList;
@@ -47,7 +47,7 @@ final class AlignmentPatternFinder {
private final int height;
private final float moduleSize;
private final int[] crossCheckStateCount;
private final ResultPointCallback resultPointCallback;
private final RXingResultPointCallback resultPointCallback;
/**
* <p>Creates a finder that will look in a portion of the whole image.</p>
@@ -65,7 +65,7 @@ final class AlignmentPatternFinder {
int width,
int height,
float moduleSize,
ResultPointCallback resultPointCallback) {
RXingResultPointCallback resultPointCallback) {
this.image = image;
this.possibleCenters = new ArrayList<>(5);
this.startX = startX;
@@ -268,7 +268,7 @@ final class AlignmentPatternFinder {
AlignmentPattern point = new AlignmentPattern(centerJ, centerI, estimatedModuleSize);
possibleCenters.add(point);
if (resultPointCallback != null) {
resultPointCallback.foundPossibleResultPoint(point);
resultPointCallback.foundPossibleRXingResultPoint(point);
}
}
return null;

56
src/qrcode/detector/Detector.java
View File

@@ -19,10 +19,10 @@ package com.google.zxing.qrcode.detector;
import com.google.zxing.DecodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.RXingResultPoint;
import com.google.zxing.RXingResultPointCallback;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DetectorResult;
import com.google.zxing.common.DetectorRXingResult;
import com.google.zxing.common.GridSampler;
import com.google.zxing.common.PerspectiveTransform;
import com.google.zxing.common.detector.MathUtils;
@@ -39,7 +39,7 @@ import java.util.Map;
public class Detector {
private final BitMatrix image;
private ResultPointCallback resultPointCallback;
private RXingResultPointCallback resultPointCallback;
public Detector(BitMatrix image) {
this.image = image;
@@ -49,18 +49,18 @@ public class Detector {
return image;
}
protected final ResultPointCallback getResultPointCallback() {
protected final RXingResultPointCallback getRXingResultPointCallback() {
return resultPointCallback;
}
/**
* <p>Detects a QR Code in an image.</p>
*
* @return {@link DetectorResult} encapsulating results of detecting a QR Code
* @return {@link DetectorRXingResult} encapsulating results of detecting a QR Code
* @throws NotFoundException if QR Code cannot be found
* @throws FormatException if a QR Code cannot be decoded
*/
public DetectorResult detect() throws NotFoundException, FormatException {
public DetectorRXingResult detect() throws NotFoundException, FormatException {
return detect(null);
}
@@ -68,14 +68,14 @@ public class Detector {
* <p>Detects a QR Code in an image.</p>
*
* @param hints optional hints to detector
* @return {@link DetectorResult} encapsulating results of detecting a QR Code
* @return {@link DetectorRXingResult} encapsulating results of detecting a QR Code
* @throws NotFoundException if QR Code cannot be found
* @throws FormatException if a QR Code cannot be decoded
*/
public final DetectorResult detect(Map<DecodeHintType,?> hints) throws NotFoundException, FormatException {
public final DetectorRXingResult detect(Map<DecodeHintType,?> hints) throws NotFoundException, FormatException {
resultPointCallback = hints == null ? null :
(ResultPointCallback) hints.get(DecodeHintType.NEED_RESULT_POINT_CALLBACK);
(RXingResultPointCallback) hints.get(DecodeHintType.NEED_RESULT_POINT_CALLBACK);
FinderPatternFinder finder = new FinderPatternFinder(image, resultPointCallback);
FinderPatternInfo info = finder.find(hints);
@@ -83,7 +83,7 @@ public class Detector {
return processFinderPatternInfo(info);
}
protected final DetectorResult processFinderPatternInfo(FinderPatternInfo info)
protected final DetectorRXingResult processFinderPatternInfo(FinderPatternInfo info)
throws NotFoundException, FormatException {
FinderPattern topLeft = info.getTopLeft();
@@ -132,19 +132,19 @@ public class Detector {
BitMatrix bits = sampleGrid(image, transform, dimension);
ResultPoint[] points;
RXingResultPoint[] points;
if (alignmentPattern == null) {
points = new ResultPoint[]{bottomLeft, topLeft, topRight};
points = new RXingResultPoint[]{bottomLeft, topLeft, topRight};
} else {
points = new ResultPoint[]{bottomLeft, topLeft, topRight, alignmentPattern};
points = new RXingResultPoint[]{bottomLeft, topLeft, topRight, alignmentPattern};
}
return new DetectorResult(bits, points);
return new DetectorRXingResult(bits, points);
}
private static PerspectiveTransform createTransform(ResultPoint topLeft,
ResultPoint topRight,
ResultPoint bottomLeft,
ResultPoint alignmentPattern,
private static PerspectiveTransform createTransform(RXingResultPoint topLeft,
RXingResultPoint topRight,
RXingResultPoint bottomLeft,
RXingResultPoint alignmentPattern,
int dimension) {
float dimMinusThree = dimension - 3.5f;
float bottomRightX;
@@ -195,12 +195,12 @@ public class Detector {
* <p>Computes the dimension (number of modules on a size) of the QR Code based on the position
* of the finder patterns and estimated module size.</p>
*/
private static int computeDimension(ResultPoint topLeft,
ResultPoint topRight,
ResultPoint bottomLeft,
private static int computeDimension(RXingResultPoint topLeft,
RXingResultPoint topRight,
RXingResultPoint bottomLeft,
float moduleSize) throws NotFoundException {
int tltrCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, topRight) / moduleSize);
int tlblCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, bottomLeft) / moduleSize);
int tltrCentersDimension = MathUtils.round(RXingResultPoint.distance(topLeft, topRight) / moduleSize);
int tlblCentersDimension = MathUtils.round(RXingResultPoint.distance(topLeft, bottomLeft) / moduleSize);
int dimension = ((tltrCentersDimension + tlblCentersDimension) / 2) + 7;
switch (dimension & 0x03) { // mod 4
case 0:
@@ -225,9 +225,9 @@ public class Detector {
* @param bottomLeft detected bottom-left finder pattern center
* @return estimated module size
*/
protected final float calculateModuleSize(ResultPoint topLeft,
ResultPoint topRight,
ResultPoint bottomLeft) {
protected final float calculateModuleSize(RXingResultPoint topLeft,
RXingResultPoint topRight,
RXingResultPoint bottomLeft) {
// Take the average
return (calculateModuleSizeOneWay(topLeft, topRight) +
calculateModuleSizeOneWay(topLeft, bottomLeft)) / 2.0f;
@@ -238,7 +238,7 @@ public class Detector {
* {@link #sizeOfBlackWhiteBlackRunBothWays(int, int, int, int)} to figure the
* width of each, measuring along the axis between their centers.</p>
*/
private float calculateModuleSizeOneWay(ResultPoint pattern, ResultPoint otherPattern) {
private float calculateModuleSizeOneWay(RXingResultPoint pattern, RXingResultPoint otherPattern) {
float moduleSizeEst1 = sizeOfBlackWhiteBlackRunBothWays((int) pattern.getX(),
(int) pattern.getY(),
(int) otherPattern.getX(),

4
src/qrcode/detector/FinderPattern.java
View File

@@ -16,7 +16,7 @@
package com.google.zxing.qrcode.detector;
import com.google.zxing.ResultPoint;
import com.google.zxing.RXingResultPoint;
/**
* <p>Encapsulates a finder pattern, which are the three square patterns found in
@@ -25,7 +25,7 @@ import com.google.zxing.ResultPoint;
*
* @author Sean Owen
*/
public final class FinderPattern extends ResultPoint {
public final class FinderPattern extends RXingResultPoint {
private final float estimatedModuleSize;
private final int count;

14
src/qrcode/detector/FinderPatternFinder.java
View File

@@ -18,8 +18,8 @@ package com.google.zxing.qrcode.detector;
import com.google.zxing.DecodeHintType;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.RXingResultPoint;
import com.google.zxing.RXingResultPointCallback;
import com.google.zxing.common.BitMatrix;
import java.io.Serializable;
@@ -48,7 +48,7 @@ public class FinderPatternFinder {
private final List<FinderPattern> possibleCenters;
private boolean hasSkipped;
private final int[] crossCheckStateCount;
private final ResultPointCallback resultPointCallback;
private final RXingResultPointCallback resultPointCallback;
/**
* <p>Creates a finder that will search the image for three finder patterns.</p>
@@ -59,7 +59,7 @@ public class FinderPatternFinder {
this(image, null);
}
public FinderPatternFinder(BitMatrix image, ResultPointCallback resultPointCallback) {
public FinderPatternFinder(BitMatrix image, RXingResultPointCallback resultPointCallback) {
this.image = image;
this.possibleCenters = new ArrayList<>();
this.crossCheckStateCount = new int[5];
@@ -162,7 +162,7 @@ public class FinderPatternFinder {
}
FinderPattern[] patternInfo = selectBestPatterns();
ResultPoint.orderBestPatterns(patternInfo);
RXingResultPoint.orderBestPatterns(patternInfo);
return new FinderPatternInfo(patternInfo);
}
@@ -529,7 +529,7 @@ public class FinderPatternFinder {
FinderPattern point = new FinderPattern(centerJ, centerI, estimatedModuleSize);
possibleCenters.add(point);
if (resultPointCallback != null) {
resultPointCallback.foundPossibleResultPoint(point);
resultPointCallback.foundPossibleRXingResultPoint(point);
}
}
return true;
@@ -549,7 +549,7 @@ public class FinderPatternFinder {
if (max <= 1) {
return 0;
}
ResultPoint firstConfirmedCenter = null;
RXingResultPoint firstConfirmedCenter = null;
for (FinderPattern center : possibleCenters) {
if (center.getCount() >= CENTER_QUORUM) {
if (firstConfirmedCenter == null) {