From 6d5fcc78e3e1d1f9879566b88bd95fa6921babfa Mon Sep 17 00:00:00 2001 From: hooper114 Date: Wed, 5 Aug 2009 17:59:28 +0000 Subject: [PATCH] Improved FNC1 handling --- backend/aztec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/aztec.c b/backend/aztec.c index 57b7502f..7d73e72f 100644 --- a/backend/aztec.c +++ b/backend/aztec.c @@ -78,13 +78,6 @@ int aztec_text_process(unsigned char source[], char binary_string[], int gs1) typemap[maplength] = PUNC; maplength++; } - if(source[i] > 127) { - charmap[maplength] = source[i]; - typemap[maplength] = BINARY; - } else { - charmap[maplength] = AztecSymbolChar[source[i]]; - typemap[maplength] = AztecCodeSet[source[i]]; - } if((gs1) && (source[i] == '[')) { /* FNC1 represented by FLG(0) */ charmap[maplength] = 0; @@ -92,6 +85,14 @@ int aztec_text_process(unsigned char source[], char binary_string[], int gs1) maplength++; charmap[maplength] = 400; typemap[maplength] = PUNC; + } else { + if(source[i] > 127) { + charmap[maplength] = source[i]; + typemap[maplength] = BINARY; + } else { + charmap[maplength] = AztecSymbolChar[source[i]]; + typemap[maplength] = AztecCodeSet[source[i]]; + } } maplength++; }