Ignore obviously suboptimal encodings for DataMatrix AUTO mode

DEVSIX-1845

Author: LodrKumquat

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

@@ -1246,29 +1246,28 @@ private int getEncodation(byte[] text, int textOffset, int textSize, byte[] data
             f[3][0] = b256Encodation(text, textOffset, 1, dataDynamic[3], dataOffset, dataSize, 0, -1, dataOffset);
             f[4][0] = X12Encodation(text, textOffset, 1, dataDynamic[4], dataOffset, dataSize, 0, -1, dataOffset);
             f[5][0] = EdifactEncodation(text, textOffset, 1, dataDynamic[5], dataOffset, dataSize, 0, -1, dataOffset, sizeFixed);
-            int[] dataNewOffset = new int[6];
             for (int i = 1; i < textSize; i++) {
                 int tempForMin[] = new int[6];
-                for (int k = 0; k < 6; k++) {
-                    dataNewOffset[k] = f[k][i - 1] >= 0 ? f[k][i - 1] : Integer.MAX_VALUE;
-                }
                 for (int currEnc = 0; currEnc < 6; currEnc++) {
                     byte[][] dataDynamicInner = new byte[6][data.length];
                     for (int prevEnc = 0; prevEnc < 6; prevEnc++) {
                         System.arraycopy(dataDynamic[prevEnc], 0, dataDynamicInner[prevEnc], 0, data.length);
-                        if (currEnc == 0)
-                            tempForMin[prevEnc] = asciiEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 1)
-                            tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], true, i, prevEnc + 1, dataOffset);
-                        if (currEnc == 2)
-                            tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], false, i, prevEnc + 1, dataOffset);
-                        if (currEnc == 3)
-                            tempForMin[prevEnc] = b256Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 4)
-                            tempForMin[prevEnc] = X12Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 5)
-                            tempForMin[prevEnc] = EdifactEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset, sizeFixed);
-
+                        if (f[prevEnc][i - 1] < 0)
+                            tempForMin[prevEnc] = -1;
+                        else {
+                            if (currEnc == 0)
+                                tempForMin[prevEnc] = asciiEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 1)
+                                tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], true, i, prevEnc + 1, dataOffset);
+                            if (currEnc == 2)
+                                tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], false, i, prevEnc + 1, dataOffset);
+                            if (currEnc == 3)
+                                tempForMin[prevEnc] = b256Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 4)
+                                tempForMin[prevEnc] = X12Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 5)
+                                tempForMin[prevEnc] = EdifactEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset, sizeFixed);
+                        }
                     }
                     solveFAndSwitchMode(tempForMin, currEnc, i);
                     if (switchMode[currEnc][i] != 0)

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeDataMatrixTest.java

@@ -185,14 +185,12 @@ public void barcode06Test() throws IOException, PdfException, InterruptedExcepti
 
     @Test
     public void barcode07Test() {
-        //TODO: update test after DEVSIX-1845
-        junitExpectedException.expect(ArrayIndexOutOfBoundsException.class);
         BarcodeDataMatrix bc = new BarcodeDataMatrix();
         bc.setOptions(BarcodeDataMatrix.DM_AUTO);
         bc.setWidth(10);
         bc.setHeight(10);
 
-        String aCode = "aBCdeFG12"; //exception
+        String aCode = "aBCdeFG12";
 
         int result = bc.setCode(aCode);
         Assert.assertEquals(result, BarcodeDataMatrix.DM_ERROR_TEXT_TOO_BIG);