Fix MaxiCode handling of vertical quiet zone (#1671)

core/src/main/java/com/google/zxing/maxicode/MaxiCodeReader.java

@@ -98,7 +98,7 @@ public final class MaxiCodeReader implements Reader {
     // Now just read off the bits
     BitMatrix bits = new BitMatrix(MATRIX_WIDTH, MATRIX_HEIGHT);
     for (int y = 0; y < MATRIX_HEIGHT; y++) {
-      int iy = Math.min(top + (y * height + height / 2) / MATRIX_HEIGHT, height - 1);
+      int iy = top + Math.min((y * height + height / 2) / MATRIX_HEIGHT, height - 1);
       for (int x = 0; x < MATRIX_WIDTH; x++) {
         // srowen: I don't quite understand why the formula below is necessary, but it
         // can walk off the image if left + width = the right boundary. So cap it.

core/src/test/java/com/google/zxing/maxicode/MaxiCodeBlackBox1TestCase.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.maxicode;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.common.AbstractBlackBoxTestCase;
-
-/**
- * Tests all characters in Set A.
- *
- * @author Daniel Gredler
- * @see <a href="https://github.com/zxing/zxing/issues/1543">Defect 1543</a>
- */
-public final class MaxiCodeBlackBox1TestCase extends AbstractBlackBoxTestCase {
-
-  public MaxiCodeBlackBox1TestCase() {
-    super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE);
-    addHint(DecodeHintType.PURE_BARCODE);
-    addTest(8, 8, 0.0f);
-  }
-
-}

core/src/test/java/com/google/zxing/maxicode/Maxicode1TestCase.java

@@ -27,7 +27,7 @@ public final class Maxicode1TestCase extends AbstractBlackBoxTestCase {
 
   public Maxicode1TestCase() {
     super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE);
-    addTest(8, 8, 0.0f);
+    addTest(9, 9, 0.0f);
   }
 
 }

core/src/test/resources/blackbox/maxicode-1/mode5-with-large-quiet-zone.txt

@@ -0,0 +1 @@
+[)>0196123450000222111MODE5