mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-21 02:55:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add hint to correct wrong dimension

Browse source 
Fix issue #1900
This commit is contained in:
Matthias Agethle 2025-02-03 11:17:02 +01:00
parent 2dfb2054af
commit 16723b3434
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/com/google/zxing/DecodeHintType.java
View file

@ -104,6 +104,19 @@ public enum DecodeHintType {
*/ */
ALSO_INVERTED(Void.class), ALSO_INVERTED(Void.class),
/**
* If true, it will round down wrong dimension to next possible value.
* Doesn't matter what it maps to; use {@link Boolean#TRUE}.
*/
CORRECT_DIMENSION_TO_LOWER_VALUE(Void.class),
/**
* If true, it will round up wrong dimension to next possible value.
* Doesn't matter what it maps to; use {@link Boolean#TRUE}.
*/
CORRECT_DIMENSION_TO_UPPER_VALUE(Void.class),
// End of enumeration values. // End of enumeration values.
; ;

2
core/src/main/java/com/google/zxing/multi/qrcode/detector/MultiDetector.java
View file

@ -58,7 +58,7 @@ public final class MultiDetector extends Detector {
List<DetectorResult> result = new ArrayList<>(); List<DetectorResult> result = new ArrayList<>();
for (FinderPatternInfo info : infos) { for (FinderPatternInfo info : infos) {
try { try {
result.add(processFinderPatternInfo(info)); result.add(processFinderPatternInfo(info, hints));
} catch (ReaderException e) { } catch (ReaderException e) {
// ignore // ignore
} }

16
core/src/main/java/com/google/zxing/qrcode/detector/Detector.java
View file

@ -80,10 +80,10 @@ public class Detector {
FinderPatternFinder finder = new FinderPatternFinder(image, resultPointCallback); FinderPatternFinder finder = new FinderPatternFinder(image, resultPointCallback);
FinderPatternInfo info = finder.find(hints); FinderPatternInfo info = finder.find(hints);
return processFinderPatternInfo(info); return processFinderPatternInfo(info, hints);
} }
protected final DetectorResult processFinderPatternInfo(FinderPatternInfo info) protected final DetectorResult processFinderPatternInfo(FinderPatternInfo info, Map<DecodeHintType,?> hints)
throws NotFoundException, FormatException { throws NotFoundException, FormatException {
FinderPattern topLeft = info.getTopLeft(); FinderPattern topLeft = info.getTopLeft();
@ -94,7 +94,7 @@ public class Detector {
if (moduleSize < 1.0f) { if (moduleSize < 1.0f) {
throw NotFoundException.getNotFoundInstance(); throw NotFoundException.getNotFoundInstance();
} }
int dimension = computeDimension(topLeft, topRight, bottomLeft, moduleSize); int dimension = computeDimension(topLeft, topRight, bottomLeft, moduleSize, hints);
Version provisionalVersion = Version.getProvisionalVersionForDimension(dimension); Version provisionalVersion = Version.getProvisionalVersionForDimension(dimension);
int modulesBetweenFPCenters = provisionalVersion.getDimensionForVersion() - 7; int modulesBetweenFPCenters = provisionalVersion.getDimensionForVersion() - 7;
@ -198,7 +198,8 @@ public class Detector {
private static int computeDimension(ResultPoint topLeft, private static int computeDimension(ResultPoint topLeft,
ResultPoint topRight, ResultPoint topRight,
ResultPoint bottomLeft, ResultPoint bottomLeft,
float moduleSize) throws NotFoundException { float moduleSize,
Map<DecodeHintType,?> hints) throws NotFoundException {
int tltrCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, topRight) / moduleSize); int tltrCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, topRight) / moduleSize);
int tlblCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, bottomLeft) / moduleSize); int tlblCentersDimension = MathUtils.round(ResultPoint.distance(topLeft, bottomLeft) / moduleSize);
int dimension = ((tltrCentersDimension + tlblCentersDimension) / 2) + 7; int dimension = ((tltrCentersDimension + tlblCentersDimension) / 2) + 7;
@ -211,7 +212,12 @@ public class Detector {
dimension--; dimension--;
break; break;
case 3: case 3:
throw NotFoundException.getNotFoundInstance(); if (hints != null && hints.get(DecodeHintType.CORRECT_DIMENSION_TO_LOWER_VALUE)!=null)
dimension = dimension - 2;
else if (hints != null && hints.get(DecodeHintType.CORRECT_DIMENSION_TO_UPPER_VALUE)!=null)
dimension = dimension + 2;
else
throw NotFoundException.getNotFoundInstance();
} }
return dimension; return dimension;
} }