mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-19 21:17:33 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid decoding stacked row 1 of N independently (#1693)

Browse source 
* Avoid decoding stacked row 1 of N independently

* Avoid decoding stacked row 1 of N independently
This commit is contained in:
Daniel Gredler 2023-09-16 09:15:21 -04:00 committed by GitHub
parent 465753afe6
commit 2dd6cb43dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/java/com/google/zxing/oned/rss/expanded/RSSExpandedReader.java
View file

@ -167,8 +167,7 @@ public final class RSSExpandedReader extends AbstractRSSReader {
}
}
// TODO: verify sequence of finder patterns as in checkPairSequence()
if (checkChecksum()) {
if (checkChecksum() && isValidSequence(this.pairs, true)) {
return this.pairs;
}
@ -229,7 +228,7 @@ public final class RSSExpandedReader extends AbstractRSSReader {
}
this.pairs.addAll(row.getPairs());
if (isValidSequence(this.pairs)) {
if (isValidSequence(this.pairs, false)) {
if (checkChecksum()) {
return this.pairs;
}
@ -249,10 +248,11 @@ public final class RSSExpandedReader extends AbstractRSSReader {
}
// Whether the pairs form a valid finder pattern sequence, either complete or a prefix
private static boolean isValidSequence(List<ExpandedPair> pairs) {
private static boolean isValidSequence(List<ExpandedPair> pairs, boolean complete) {
for (int[] sequence : FINDER_PATTERN_SEQUENCES) {
if (pairs.size() <= sequence.length) {
boolean sizeOk = (complete ? pairs.size() == sequence.length : pairs.size() <= sequence.length);
if (sizeOk) {
boolean stop = true;
for (int j = 0; j < pairs.size(); j++) {
if (pairs.get(j).getFinderPattern().getValue() != sequence[j]) {

5
core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedBlackBox1TestCase.java
View file

@ -38,9 +38,8 @@ public final class RSSExpandedStackedBlackBox1TestCase extends AbstractBlackBoxT
public RSSExpandedStackedBlackBox1TestCase() {
super("src/test/resources/blackbox/rssexpandedstacked-1", new MultiFormatReader(), BarcodeFormat.RSS_EXPANDED);
addTest(59, 64, 0.0f);
addTest(59, 64, 180.0f);
addTest(60, 65, 0.0f);
addTest(60, 65, 180.0f);
}
}

BIN
core/src/test/resources/blackbox/rssexpandedstacked-1/65.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

1
core/src/test/resources/blackbox/rssexpandedstacked-1/65.txt Normal file
View file

@ -0,0 +1 @@
(8110))2345672(1*813