mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-19 21:17:33 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Additional fix for issue #300 (HT micjahn)

Browse source
This commit is contained in:
Sean Owen 2015-02-06 21:39:28 +00:00
parent 4b02337709
commit 625d9b77d7
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/com/google/zxing/datamatrix/encoder/X12Encoder.java
View file

@ -73,10 +73,11 @@ final class X12Encoder extends C40Encoder {
int available = context.getSymbolInfo().getDataCapacity() - context.getCodewordCount();
int count = buffer.length();
context.pos -= count;
if (context.getRemainingCharacters() != 1 || available != 1) {
if (context.getRemainingCharacters() > 1 || available > 1 ||
context.getRemainingCharacters() != available) {
context.writeCodeword(HighLevelEncoder.X12_UNLATCH);
}
if (count > 0) {
if (context.getNewEncoding() < 0) {
context.signalEncoderChange(HighLevelEncoder.ASCII_ENCODATION);
}
}

6
core/src/test/java/com/google/zxing/datamatrix/encoder/HighLevelEncodeTestCase.java
View file

@ -325,6 +325,12 @@ public final class HighLevelEncodeTestCase extends Assert {
assertEquals("238 9 10 104 141 254 50 129", visualized);
}
@Test
public void testX12Unlatch2() {
String visualized = encodeHighLevel("*DTCP0");
assertEquals("238 9 10 104 141", visualized);
}
@Test
public void testBug3048549() {
//There was an IllegalArgumentException for an illegal character here because