fix code93 extended character decoder (#1101)

2 files changed, 62 insertions, 4 deletions

diff --git a/core/src/main/java/com/google/zxing/oned/Code93Reader.java b/core/src/main/java/com/google/zxing/oned/Code93Reader.java
index a27c30e64..74cc38264 100644
--- a/core/src/main/java/com/google/zxing/oned/Code93Reader.java
+++ b/core/src/main/java/com/google/zxing/oned/Code93Reader.java
@@ -232,11 +232,20 @@ public final class Code93Reader extends OneDReader {
             } else if (next >= 'K' && next <= 'O') {
               // %K to %O map to [ \ ] ^ _
               decodedChar = (char) (next + 16);
-            } else if (next >= 'P' && next <= 'S') {
-              // %P to %S map to { | } ~
+            } else if (next >= 'P' && next <= 'T') {
+              // %P to %T map to { | } ~ DEL
               decodedChar = (char) (next + 43);
-            } else if (next >= 'T' && next <= 'Z') {
-              // %T to %Z all map to DEL (127)
+            } else if (next == 'U') {
+              // %U map to NUL
+              decodedChar = '\0';
+            } else if (next == 'V') {
+              // %V map to @
+              decodedChar = '@';
+            } else if (next == 'W') {
+              // %W map to `
+              decodedChar = '`';
+            } else if (next >= 'X' && next <= 'Z') {
+              // %X to %Z all map to DEL (127)
               decodedChar = 127;
             } else {
               throw FormatException.getFormatInstance();
diff --git a/core/src/test/java/com/google/zxing/oned/Code93ReaderTestCase.java b/core/src/test/java/com/google/zxing/oned/Code93ReaderTestCase.java
new file mode 100644
index 000000000..48a0f5c03
--- /dev/null
+++ b/core/src/test/java/com/google/zxing/oned/Code93ReaderTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 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.oned;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.BitArray;
+import com.google.zxing.ChecksumException;
+import com.google.zxing.FormatException;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.Result;
+
+/**
+ * @author Daisuke Makiuchi
+ */
+public final class Code93ReaderTestCase extends Assert {
+
+  @Test
+  public void testDecode() throws Exception {
+    doTest("Code93!\n$%/+ :\u001b;[{\u007f\u0000@`\u007f\u007f\u007f",
+           "0000001010111101101000101001100101001011001001100101100101001001100101100100101000010101010000101110101101101010001001001101001101001110010101101011101011011101011101101110100101110101101001110101110110101101010001110110101100010101110110101000110101110110101000101101110110101101001101110110101100101101110110101100110101110110101011011001110110101011001101110110101001101101110110101001110101001100101101010001010111101111");
+  }
+
+  private static void doTest(String expectedResult, String encodedResult) throws FormatException, ChecksumException, NotFoundException {
+    Code93Reader sut = new Code93Reader();
+    BitMatrix matrix = BitMatrix.parse(encodedResult, "1", "0");
+    BitArray row = new BitArray(matrix.getWidth());
+    matrix.getRow(0, row);
+    Result result = sut.decodeRow(0, row, null);
+    assertEquals(expectedResult, result.getText());
+  }
+
+}