From 207b5e294da25bf757f4c3d2b84cd80a8db1315b Mon Sep 17 00:00:00 2001 From: srowen Date: Wed, 17 Nov 2010 07:15:46 +0000 Subject: [PATCH] Fix for shift handling git-svn-id: https://zxing.googlecode.com/svn/trunk@1660 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- core/src/com/google/zxing/oned/Code128Reader.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/core/src/com/google/zxing/oned/Code128Reader.java b/core/src/com/google/zxing/oned/Code128Reader.java index b41d954d2..e15370aeb 100644 --- a/core/src/com/google/zxing/oned/Code128Reader.java +++ b/core/src/com/google/zxing/oned/Code128Reader.java @@ -361,7 +361,7 @@ public final class Code128Reader extends OneDReader { break; case CODE_SHIFT: isNextShifted = true; - codeSet = CODE_CODE_C; + codeSet = CODE_CODE_A; break; case CODE_CODE_A: codeSet = CODE_CODE_A; @@ -405,17 +405,7 @@ public final class Code128Reader extends OneDReader { // Unshift back to another code set if we were shifted if (unshift) { - switch (codeSet) { - case CODE_CODE_A: - codeSet = CODE_CODE_C; - break; - case CODE_CODE_B: - codeSet = CODE_CODE_A; - break; - case CODE_CODE_C: - codeSet = CODE_CODE_B; - break; - } + codeSet = codeSet == CODE_CODE_A ? CODE_CODE_B : CODE_CODE_A; } }