mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add GS1 support to Code 16k

Browse Source
This commit is contained in:
hooper114 2009-01-13 17:49:00 +00:00
parent 64731a4ddd
commit 700c47d9d0
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
backend/code16k.c
View File

@ -125,10 +125,13 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
float glyph_count; float glyph_count;
int errornum, first_sum, second_sum; int errornum, first_sum, second_sum;
int input_length; int input_length;
int gs1;
errornum = 0; errornum = 0;
input_length = ustrlen(source); input_length = ustrlen(source);
if(symbol->input_mode == GS1_MODE) { gs1 = 1; } else { gs1 = 0; }
if(input_length > 157) { if(input_length > 157) {
strcpy(symbol->errtxt, "Input too long [231]"); strcpy(symbol->errtxt, "Input too long [231]");
return ERROR_TOO_LONG; return ERROR_TOO_LONG;
@ -171,6 +174,7 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
indexchaine = 0; indexchaine = 0;
mode = parunmodd(source[indexchaine], symbol->nullchar); mode = parunmodd(source[indexchaine], symbol->nullchar);
if((gs1) && (source[indexchaine] == '[')) { mode = ABORC; } /* FNC1 */
for(i = 0; i < 160; i++) { for(i = 0; i < 160; i++) {
list[0][i] = 0; list[0][i] = 0;
@ -182,6 +186,7 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
list[0][indexliste]++; list[0][indexliste]++;
indexchaine++; indexchaine++;
mode = parunmodd(source[indexchaine], symbol->nullchar); mode = parunmodd(source[indexchaine], symbol->nullchar);
if((gs1) && (source[indexchaine] == '[')) { mode = ABORC; } /* FNC1 */
} }
indexliste++; indexliste++;
} while (indexchaine < input_length); } while (indexchaine < input_length);
@ -223,6 +228,21 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
} }
} }
/* We have a problem with FNC1 in Code Set C to resolve */
for(i = 0; i < read; i++) {
if((set[i] == 'C') && (source[i] == '[')) {
int c_count;
c_count = 0;
for(j = 0; j < i; j++) {
if(set[j] == 'C') { c_count++; } else { c_count = 0; }
}
if((c_count % 2) == 1) {
set[i - 1] = 'B';
}
}
}
/* Make sure the data will fit in the symbol */ /* Make sure the data will fit in the symbol */
last_set = ' '; last_set = ' ';
last_fset = ' '; last_fset = ' ';
@ -264,7 +284,7 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
} }
} }
if(set[i] == 'C') { if((set[i] == 'C') && (!((gs1) && (source[i] == '[')))) {
glyph_count = glyph_count + 0.5; glyph_count = glyph_count + 0.5;
} else { } else {
glyph_count = glyph_count + 1.0; glyph_count = glyph_count + 1.0;
@ -389,17 +409,23 @@ int code16k(struct zint_symbol *symbol, unsigned char source[])
bar_characters++; bar_characters++;
} }
switch(set[read]) if(!((gs1) && (source[read] == '['))) {
{ /* Encode data characters */ switch(set[read])
case 'A': c16k_set_a(source[read], values, &bar_characters, symbol->nullchar); { /* Encode data characters */
read++; case 'A': c16k_set_a(source[read], values, &bar_characters, symbol->nullchar);
break; read++;
case 'B': c16k_set_b(source[read], values, &bar_characters); break;
read++; case 'B': c16k_set_b(source[read], values, &bar_characters);
break; read++;
case 'C': c16k_set_c(source[read], source[read + 1], values, &bar_characters); break;
read += 2; case 'C': c16k_set_c(source[read], source[read + 1], values, &bar_characters);
break; read += 2;
break;
}
} else {
values[bar_characters] = 102;
bar_characters++;
read++;
} }
} while (read < ustrlen(source)); } while (read < ustrlen(source));

1
backend/library.c
View File

@ -200,6 +200,7 @@ int gs1_compliant(int symbology)
case BARCODE_RSS14STACK_CC: case BARCODE_RSS14STACK_CC:
case BARCODE_RSS14_OMNI_CC: case BARCODE_RSS14_OMNI_CC:
case BARCODE_RSS_EXPSTACK_CC: case BARCODE_RSS_EXPSTACK_CC:
case BARCODE_CODE16K:
result = 1; result = 1;
break; break;
} }