Avoid decoding stacked row 1 of N independently

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

@@ -167,8 +167,7 @@ List<ExpandedPair> decodeRow2pairs(int rowNumber, BitArray row) throws NotFoundE
       }
     }
 
-    // TODO: verify sequence of finder patterns as in checkPairSequence()
-    if (checkChecksum()) {
+    if (checkChecksum() && isValidSequence(this.pairs, true)) {
       return this.pairs;
     }
 
@@ -229,7 +228,7 @@ private List<ExpandedPair> checkRows(List<ExpandedRow> collectedRows, int curren
       }
       this.pairs.addAll(row.getPairs());
 
-      if (isValidSequence(this.pairs)) {
+      if (isValidSequence(this.pairs, false)) {
         if (checkChecksum()) {
           return this.pairs;
         }
@@ -249,10 +248,11 @@ private List<ExpandedPair> checkRows(List<ExpandedRow> collectedRows, int curren
   }
 
   // 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]) {

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

@@ -35,12 +35,11 @@
  * stacked RSS barcodes.
  */
 public final class RSSExpandedStackedBlackBox1TestCase extends AbstractBlackBoxTestCase {
-    
+
   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);
   }
 
 }
-

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

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