From a7c35168268929b88c3dbcd0eeeb0708592acb6c Mon Sep 17 00:00:00 2001 From: gitlost Date: Wed, 17 Mar 2021 23:12:40 +0000 Subject: [PATCH] Update DMRE versions to ISO/IEC 21471:2020 (#1369) --- .../com/google/zxing/common/BitMatrix.java | 14 ++---- .../datamatrix/decoder/BitMatrixParser.java | 6 ++- .../zxing/datamatrix/decoder/Version.java | 43 +++++++++++------- .../DataMatrixBlackBox3TestCase.java | 36 +++++++++++++++ .../blackbox/datamatrix-3/abcd-120x8.png | Bin 0 -> 224 bytes .../blackbox/datamatrix-3/abcd-120x8.txt | 1 + .../blackbox/datamatrix-3/abcd-144x8.png | Bin 0 -> 245 bytes .../blackbox/datamatrix-3/abcd-144x8.txt | 1 + .../blackbox/datamatrix-3/abcd-36x20.png | Bin 0 -> 232 bytes .../blackbox/datamatrix-3/abcd-36x20.txt | 1 + .../blackbox/datamatrix-3/abcd-40x26.png | Bin 0 -> 278 bytes .../blackbox/datamatrix-3/abcd-40x26.txt | 1 + .../blackbox/datamatrix-3/abcd-44x20.png | Bin 0 -> 249 bytes .../blackbox/datamatrix-3/abcd-44x20.txt | 1 + .../blackbox/datamatrix-3/abcd-48x22.png | Bin 0 -> 274 bytes .../blackbox/datamatrix-3/abcd-48x22.txt | 1 + .../blackbox/datamatrix-3/abcd-48x24.png | Bin 0 -> 289 bytes .../blackbox/datamatrix-3/abcd-48x24.txt | 1 + .../blackbox/datamatrix-3/abcd-48x26.png | Bin 0 -> 305 bytes .../blackbox/datamatrix-3/abcd-48x26.txt | 1 + .../blackbox/datamatrix-3/abcd-48x8.png | Bin 0 -> 167 bytes .../blackbox/datamatrix-3/abcd-48x8.txt | 1 + .../blackbox/datamatrix-3/abcd-64x12.png | Bin 0 -> 220 bytes .../blackbox/datamatrix-3/abcd-64x12.txt | 1 + .../blackbox/datamatrix-3/abcd-64x16.png | Bin 0 -> 261 bytes .../blackbox/datamatrix-3/abcd-64x16.txt | 1 + .../blackbox/datamatrix-3/abcd-64x20.png | Bin 0 -> 298 bytes .../blackbox/datamatrix-3/abcd-64x20.txt | 1 + .../blackbox/datamatrix-3/abcd-64x24.png | Bin 0 -> 338 bytes .../blackbox/datamatrix-3/abcd-64x24.txt | 1 + .../blackbox/datamatrix-3/abcd-64x26.png | Bin 0 -> 364 bytes .../blackbox/datamatrix-3/abcd-64x26.txt | 1 + .../blackbox/datamatrix-3/abcd-64x8.png | Bin 0 -> 181 bytes .../blackbox/datamatrix-3/abcd-64x8.txt | 1 + .../blackbox/datamatrix-3/abcd-80x8.png | Bin 0 -> 195 bytes .../blackbox/datamatrix-3/abcd-80x8.txt | 1 + .../blackbox/datamatrix-3/abcd-88x12.png | Bin 0 -> 252 bytes .../blackbox/datamatrix-3/abcd-88x12.txt | 1 + .../blackbox/datamatrix-3/abcd-96x8.png | Bin 0 -> 207 bytes .../blackbox/datamatrix-3/abcd-96x8.txt | 1 + 40 files changed, 88 insertions(+), 29 deletions(-) create mode 100644 core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox3TestCase.java create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-120x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-120x8.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-144x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-144x8.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-36x20.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-36x20.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-40x26.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-40x26.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-44x20.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-44x20.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x22.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x22.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x20.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x20.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x24.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x24.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x26.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x26.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-88x12.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-88x12.txt create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-96x8.png create mode 100644 core/src/test/resources/blackbox/datamatrix-3/abcd-96x8.txt diff --git a/core/src/main/java/com/google/zxing/common/BitMatrix.java b/core/src/main/java/com/google/zxing/common/BitMatrix.java index 267b93339..6eea3b618 100755 --- a/core/src/main/java/com/google/zxing/common/BitMatrix.java +++ b/core/src/main/java/com/google/zxing/common/BitMatrix.java @@ -159,7 +159,7 @@ public final class BitMatrix implements Cloneable { */ public boolean get(int x, int y) { int offset = y * rowSize + (x / 32); - return offset < bits.length && ((bits[offset] >>> (x & 0x1f)) & 1) != 0; + return ((bits[offset] >>> (x & 0x1f)) & 1) != 0; } /** @@ -170,16 +170,12 @@ public final class BitMatrix implements Cloneable { */ public void set(int x, int y) { int offset = y * rowSize + (x / 32); - if (offset < bits.length) { - bits[offset] |= 1 << (x & 0x1f); - } + bits[offset] |= 1 << (x & 0x1f); } public void unset(int x, int y) { int offset = y * rowSize + (x / 32); - if (offset < bits.length) { - bits[offset] &= ~(1 << (x & 0x1f)); - } + bits[offset] &= ~(1 << (x & 0x1f)); } /** @@ -190,9 +186,7 @@ public final class BitMatrix implements Cloneable { */ public void flip(int x, int y) { int offset = y * rowSize + (x / 32); - if (offset < bits.length) { - bits[offset] ^= 1 << (x & 0x1f); - } + bits[offset] ^= 1 << (x & 0x1f); } /** diff --git a/core/src/main/java/com/google/zxing/datamatrix/decoder/BitMatrixParser.java b/core/src/main/java/com/google/zxing/datamatrix/decoder/BitMatrixParser.java index 201222f2c..f63c9937e 100644 --- a/core/src/main/java/com/google/zxing/datamatrix/decoder/BitMatrixParser.java +++ b/core/src/main/java/com/google/zxing/datamatrix/decoder/BitMatrixParser.java @@ -136,8 +136,7 @@ final class BitMatrixParser { } } while ((row < numRows) || (column < numColumns)); - if (resultOffset != version.getTotalCodewords() && - resultOffset != version.getTotalCodewords() - 1) { + if (resultOffset != version.getTotalCodewords()) { throw FormatException.getFormatInstance(); } return result; @@ -162,6 +161,9 @@ final class BitMatrixParser { column += numColumns; row += 4 - ((numColumns + 4) & 0x07); } + if (row >= numRows) { + row -= numRows; + } readMappingMatrix.set(column, row); return mappingBitMatrix.get(column, row); } diff --git a/core/src/main/java/com/google/zxing/datamatrix/decoder/Version.java b/core/src/main/java/com/google/zxing/datamatrix/decoder/Version.java index 3d3c8c3d4..2a133264b 100644 --- a/core/src/main/java/com/google/zxing/datamatrix/decoder/Version.java +++ b/core/src/main/java/com/google/zxing/datamatrix/decoder/Version.java @@ -233,33 +233,42 @@ public final class Version { new ECBlocks(28, new ECB(1, 49))), // extended forms as specified in - // AIM-D - Symbology Specification – Data Matrix Rectangular Extension (DMRE) - // Revision 1.0 September 22, 2014 + // ISO 21471:2020 (DMRE) 5.5.1 Table 7 new Version(31, 8, 48, 6, 22, new ECBlocks(15, new ECB(1, 18))), new Version(32, 8, 64, 6, 14, new ECBlocks(18, new ECB(1, 24))), - new Version(33, 12, 48, 10, 22, - new ECBlocks(23, new ECB(1, 32))), - new Version(34, 12, 64, 10, 14, + new Version(33, 8, 80, 6, 18, + new ECBlocks(22, new ECB(1, 32))), + new Version(34, 8, 96, 6, 22, + new ECBlocks(28, new ECB(1, 38))), + new Version(35, 8, 120, 6, 18, + new ECBlocks(32, new ECB(1, 49))), + new Version(36, 8, 144, 6, 22, + new ECBlocks(36, new ECB(1, 63))), + new Version(37, 12, 64, 10, 14, new ECBlocks(27, new ECB(1, 43))), - new Version(35, 16, 64, 14, 14, + new Version(38, 12, 88, 10, 20, + new ECBlocks(36, new ECB(1, 64))), + new Version(39, 16, 64, 14, 14, new ECBlocks(36, new ECB(1, 62))), - new Version(36, 24, 32, 22, 14, - new ECBlocks(28, new ECB(1, 49))), - new Version(37, 24, 36, 22, 16, - new ECBlocks(33, new ECB(1, 55))), - new Version(38, 24, 48, 22, 22, + new Version(40, 20, 36, 18, 16, + new ECBlocks(28, new ECB(1, 44))), + new Version(41, 20, 44, 18, 20, + new ECBlocks(34, new ECB(1, 56))), + new Version(42, 20, 64, 18, 14, + new ECBlocks(42, new ECB(1, 84))), + new Version(43, 22, 48, 20, 22, + new ECBlocks(38, new ECB(1, 72))), + new Version(44, 24, 48, 22, 22, new ECBlocks(41, new ECB(1, 80))), - new Version(39, 24, 64, 22, 14, + new Version(45, 24, 64, 22, 14, new ECBlocks(46, new ECB(1, 108))), - new Version(40, 26, 32, 24, 14, - new ECBlocks(32, new ECB(1, 52))), - new Version(41, 26, 40, 24, 18, + new Version(46, 26, 40, 24, 18, new ECBlocks(38, new ECB(1, 70))), - new Version(42, 26, 48, 24, 22, + new Version(47, 26, 48, 24, 22, new ECBlocks(42, new ECB(1, 90))), - new Version(43, 26, 64, 24, 14, + new Version(48, 26, 64, 24, 14, new ECBlocks(50, new ECB(1, 118))) }; } diff --git a/core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox3TestCase.java b/core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox3TestCase.java new file mode 100644 index 000000000..2796426e0 --- /dev/null +++ b/core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox3TestCase.java @@ -0,0 +1,36 @@ +/* + * Copyright 2008 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.datamatrix; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.MultiFormatReader; +import com.google.zxing.common.AbstractBlackBoxTestCase; + +/** + * @author gitlost + */ +public final class DataMatrixBlackBox3TestCase extends AbstractBlackBoxTestCase { + + public DataMatrixBlackBox3TestCase() { + super("src/test/resources/blackbox/datamatrix-3", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX); + addTest(18, 18, 0.0f); + addTest(17, 17, 90.0f); + addTest(18, 18, 180.0f); + addTest(18, 18, 270.0f); + } + +} diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-120x8.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-120x8.png new file mode 100644 index 0000000000000000000000000000000000000000..434c36f996e40c6f6040da743c7099f70b0cdb0f GIT binary patch literal 224 zcmV<603ZK}P)DrvG zrVf@B*a?4J5U7r+?6+X+bvxYwE2d>V=ewZCWp{^TU5IAL4$D%q)JlS4kr4RnIvG_M vaW(*7mf{Oi?X6%V`9|q+VgKik>xcdTXsjzHVFz#}00000NkvXXu0mjfE7W1L literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-144x8.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-144x8.txt new file mode 100644 index 000000000..0c2c90cfe --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-144x8.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmno \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-36x20.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-36x20.png new file mode 100644 index 0000000000000000000000000000000000000000..fefc8b17fbdd0444c42cd9c1591e8f18d484a6b2 GIT binary patch literal 232 zcmVP)U;OiS zkx5vEK0Um1tX=4(P+G&iv{$H*g|pGS7tNwOMV}6_yv2cDu{(=ahCV%OWMCik?wsNz zxZ2B}=h$(^Q%WpznD&xRO}Z!1yKT%B#Hmk}H3vEH)a4d!PVJTHIqK5HQ?GEwbnV?n io^?l{SL#c9|M~#+Gsby><@)^q0000l8^n-qU zoh7`)s4#!jQY!!&mj}`ID8;x-Q+wr88aEc^lGu*<uO|8;}+hx^MEjaN?|28Xg)1>#=V7cXFJf%rZjHk z;(g^UjLQ;sm0CsPZg){5JTbq{b*oE7^Sc*k-1jhUEDSj>K;xQ7DS;NoC2EIziO{(B cKaBtI2UVCDoVY-iI{*Lx07*qoM6N<$f<{_)@&Et; literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-40x26.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-40x26.txt new file mode 100644 index 000000000..1ec77a6f3 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-40x26.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-44x20.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-44x20.png new file mode 100644 index 0000000000000000000000000000000000000000..92e5846a2e54d151072ea7c16634a93489bd1078 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^F+i-t$P6SeG5g*EQfvV}A+G=b{|7Qd4_&SUQtLcj z978nDmmW9dVm9Dla8S%Xu%085b-&&Yt~%EO(MxNOI^_2y2T1EVelXq=W`)7qW zIx`lAFn!c|tZlhu;hA7Avm(J(C4 vZ&EMZ%#yGDn#Y=TT9n1%o;&(;f4*k!KJ-~Nq(^Q$(B%xCu6{1-oD!MYP)%j2^>sSTh#pdOh_t_Rs^<^fDo=`FQ}{WEdQK z$uCj?`aW2*re?W=J{4Ym7BP^E$@L@nFsEQtP{zRk3Dxn%YfI5Ulz9i?tvA Y0C9~FumEz3X8-^I07*qoM6N<$f=MoN?EnA( literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x22.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x22.txt new file mode 100644 index 000000000..4fb53ed51 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x22.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzab \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.png new file mode 100644 index 0000000000000000000000000000000000000000..086bf6272e7028aceb281f1193570e364ea5c1fb GIT binary patch literal 289 zcmV++0p9+JP)O(uCyV$6=WavzChF}F+n>cZp3 zT-v2wTUVVJbGEI^l%FTY4A%XcY_-OiEXN^7Uws&J(<4-*QY+@x4NA3S6O1W`yVZKA niZP)pm$lDf!kG8J82jN5f;u5QQ3>dW00000NkvXXu0mjfnOb|3 literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.txt new file mode 100644 index 000000000..dc130c1da --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x24.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.png new file mode 100644 index 0000000000000000000000000000000000000000..3c2ff49e55de50737cd33c49d491a631acc3b5ef GIT binary patch literal 305 zcmV-10nYx3P)xb+KZg>2=4t>7>J;J}>ji2Ol+ z__c%Z`ZlabqRtmUCS{ehMppHTtTLI~efnj5 zE66cBIGgBPyJbw1d82TF%`rsnPB-m_jCudZu|NC+XXivBgI8`j00000NkvXXu0mjf D`#Fj? literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.txt new file mode 100644 index 000000000..5638fa46b --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x26.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabc \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.png new file mode 100644 index 0000000000000000000000000000000000000000..42cbdd3d8ac109e5b70e1fb22654992dfaca247f GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3$P6SM`M9nDDYgKg5ZC|z{{xw!hc4FvsTfZe z#}J9jwZ{#)4j6E-1}J79Sk1AnDg6HfsS}|sYZ^;(Hcr@XyNLVmk6z!KlXcfD)VngV z$@O4}+RDYsw_g@a*}3D?wi!2@PxYM7(^f5EDy?-n)ZU$|_4%{Y&7;gW?Nh3ASR>Sc P_Aq$5`njxgN@xNA%bq`O literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.txt new file mode 100644 index 000000000..dcc7623c5 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-48x8.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxy \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.png new file mode 100644 index 0000000000000000000000000000000000000000..66055df2b91713f43580562eba4c51dd02248005 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^EkG>8$P6TB?QcB=q}T#{LR|m<{|{t_9=coyq$Ya0 zIEF}E?mc11hN$ocbw}6(LKMIZ}Z2w-Uu@&ZE{^Ev&jBMf9Z{-rX@z3e;RD# zG!2wZ7qm}^a(mUQedejs;-eAASg*_E-Ce2Zd-{gv>h>)^pX^ZER=I0xnheWkCf&!1 zmunx3?e%5Y7N}MEcxuu1&nmge$4?o2pZb#HsL?de{Y#W4GBN5t{>*#&&qL;0L8rDy Tc)ThEI*!59)z4*}Q$iB}f-YDC literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.txt new file mode 100644 index 000000000..8044e8b07 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x12.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.png new file mode 100644 index 0000000000000000000000000000000000000000..70c39c76851a18869872c7c58fc869da5349f437 GIT binary patch literal 261 zcmV+g0s8)lP)4}hy7z5 z(dZ<9%cV`PPjj{*oQ;D`SJE(Au9YwQ=4*EGVW5xHur=YkBWM^CV+pG1Usg@73vtZ}Oj`a+YG>zu2rtEk5 z289o!E>G=TfD5jRhOx{n;jAv{jpM^;q+7hkzS|aqhQa&h!~Ed`z_k+&0xYbe00000 LNkvXXu0mjfivV=Y literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.txt new file mode 100644 index 000000000..e3cd4cdf9 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x16.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x20.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x20.png new file mode 100644 index 0000000000000000000000000000000000000000..1472a6a484ca4d4675e54c8fcde36f3d3e770dc0 GIT binary patch literal 298 zcmV+_0oDGAP)`4;Vunebjp2$Jh4kTa3c)$itq+91TEThCY{Ho8xni}8cSXgIS zrl=CbG8T;^I>i8q<-X0OV;zTQiunpGqlMN%F_>raUSCFDUA@;8FIdonZMYzhX5-{Q zpfAIYZYZI^BEtg9XdKMC+7_7N<=eQpijednebcbbv!0_?biIhhmoa=Lr`TLv&=aUtP)4}2l+A1 z;g`kLhj(+NO>+e*VXZzMlStW&uw{>Gz^}0ZbLhE#TA?87DR67W(c@wnnY&zYNprx(uUCkVpm5t>%pU8 zK#00&C5_f=HViL-SGS5EDJdF8;kWZ5d}oF{n`T8~J;CWzJ4DkQXpl?pk_v1ahW86t k1}v{Gzch^YHyh>;9|>`v*hW+$M*si-07*qoM6N<$g1W6~QXFbz!P7TN$tlzVgfa7~YL1Uw|Ld zf33oj)nbnxKfV#095vTYqa;7aVG(&D<(@-BW8|@j%YaXp<1v#VSj1TPwPf49C2?aD z^bm8_S4R~C7V&I&NK;lacQQ6P+=egw9kEDC$XG-Iu9l1+XSsr~h^0@Db@#0S(%9s*8a;EF_K<*0%IY1%y2S4}$0E*l42hf$ zTcE)r1}>$Ng{ULKv526s9y^{jegk0(zoqe7=iCe&_>Gx3F0A2~Uy$0000< KMNUMnLSTZVcb#4U literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x26.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x26.txt new file mode 100644 index 000000000..ae6c51b71 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x26.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrs \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.png new file mode 100644 index 0000000000000000000000000000000000000000..8677d60f381e4345e99692a47885ff3ce54e1515 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^EkG>7$P6UQ-motRQfvV}A+G=b{|7Qd4_&SUQdyoZ zjv*44drug0IXiN&Iy~Io6keI2T~T_lOfg(=o2bv+gpbQ*7Kwj3Zzopr0E|LI2LJ#7 literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.txt new file mode 100644 index 000000000..448031a98 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-64x8.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefgh \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.png new file mode 100644 index 0000000000000000000000000000000000000000..05b36df2eb74b8200c338871f3d700860f4ae78d GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^OMqB}kr_x@Ze%G3QfvV}A+G=b{|7Qd4_&SUQWc&q zjv*44r=Hlz$zs64dVxQaHC!-5w|sF6S8rl(?)+6t@7-qgeWl(e sdh5x&9jBcXPgTku{`Fhz@V|%5B`+5&m13yR1-gO3)78&qol`;+09qYO3IG5A literal 0 HcmV?d00001 diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.txt b/core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.txt new file mode 100644 index 000000000..5b9fb2c23 --- /dev/null +++ b/core/src/test/resources/blackbox/datamatrix-3/abcd-80x8.txt @@ -0,0 +1 @@ +abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst \ No newline at end of file diff --git a/core/src/test/resources/blackbox/datamatrix-3/abcd-88x12.png b/core/src/test/resources/blackbox/datamatrix-3/abcd-88x12.png new file mode 100644 index 0000000000000000000000000000000000000000..87fa0036a99239a321095262ed985979f0cf2bda GIT binary patch literal 252 zcmVd&kd<&h-3QJV_9PtL!-w(Pg;^<}2$S}Eh();(? zoIaX5)F$RFP=Ef;^Z~(^?sImqqlxMHHsAR3|MUUKi4{mgGxw_i0000mk8ZNyw zY4(+AhM_fYWo@4(yktIo!uS1kr(-|=6x|N74%2z8bR=gU`$eW`&rA