mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for Code B FNC characters

Browse source
This commit is contained in:
mkicinski 2014-02-17 15:09:55 -05:00
parent 09eaf4e143
commit c064fe21de
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/main/java/com/google/zxing/oned/Code128Writer.java
View file

@ -106,8 +106,27 @@ public final class Code128Writer extends OneDimensionalCodeWriter {
if (newCodeSet == codeSet) { if (newCodeSet == codeSet) {
// Encode the current character // Encode the current character
if (codeSet == CODE_CODE_B) { if (codeSet == CODE_CODE_B) {
switch (contents.charAt(position)) {
case ESCAPE_FNC_1:
patternIndex = CODE_FNC_1;
position++;
break;
case ESCAPE_FNC_2:
patternIndex = CODE_FNC_2;
position++;
break;
case ESCAPE_FNC_3:
patternIndex = CODE_FNC_3;
position++;
break;
case ESCAPE_FNC_4:
patternIndex = CODE_FNC_4_B; // FIXME if this ever outputs Code A
position++;
break;
default:
patternIndex = contents.charAt(position) - ' '; patternIndex = contents.charAt(position) - ' ';
position += 1; position++;
}
} else { // CODE_CODE_C } else { // CODE_CODE_C
switch (contents.charAt(position)) { switch (contents.charAt(position)) {
case ESCAPE_FNC_1: case ESCAPE_FNC_1:

33
core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java Normal file
View file

@ -0,0 +1,33 @@
package com.google.zxing.oned;
import org.junit.Test;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.Writer;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import static org.junit.Assert.*;
public class Code128WriterTestCase {
private static final String FNC3 = "10111100010";
private static final String START_CODE_B = "11010010000";
public static final String QUIET_SPACE = "00000";
public static final String STOP = "1100011101011";
@Test
public void testEncodeWithFunc3() throws WriterException {
String toEncode = "\u00f3" + "123";
// "1" "2" "3" check digit 51
String expected = QUIET_SPACE + START_CODE_B + FNC3 + "10011100110" + "11001110010" + "11001011100" + "11101000110" + STOP + QUIET_SPACE;
Writer writer = new Code128Writer();
BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);
StringBuilder actual = new StringBuilder(result.getWidth());
for (int i = 0; i < result.getWidth(); i++) {
actual.append(result.get(i, 0) ? '1' : '0');
}
assertEquals(expected, actual.toString());
}
}