mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-06-06 01:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

More code cleanup

Browse source 
Patch 7 of 7 from "Ismael Luceno" <ismael.luceno@gmail.com>
This commit is contained in:
Robin Stuart 2010-09-14 11:36:00 +01:00
parent fc83343133
commit 7da2041cfd
19 changed files with 198 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

106
backend/gs1.c
View file

@ -170,48 +170,68 @@ int gs1_verify(struct zint_symbol *symbol, unsigned char source[], const unsigne
for(i = 0; i < ai_count; i++) {
switch (ai_value[i]) {
case 0: if(data_length[i] != 18) { error_latch = 1; } break;
case 1: if(data_length[i] != 14) { error_latch = 1; } break;
case 2: if(data_length[i] != 14) { error_latch = 1; } break;
case 1:
case 2:
case 3: if(data_length[i] != 14) { error_latch = 1; } break;
case 4: if(data_length[i] != 16) { error_latch = 1; } break;
case 11: if(data_length[i] != 6) { error_latch = 1; } break;
case 12: if(data_length[i] != 6) { error_latch = 1; } break;
case 13: if(data_length[i] != 6) { error_latch = 1; } break;
case 14: if(data_length[i] != 6) { error_latch = 1; } break;
case 15: if(data_length[i] != 6) { error_latch = 1; } break;
case 16: if(data_length[i] != 6) { error_latch = 1; } break;
case 17: if(data_length[i] != 6) { error_latch = 1; } break;
case 18: if(data_length[i] != 6) { error_latch = 1; } break;
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 19: if(data_length[i] != 6) { error_latch = 1; } break;
case 20: if(data_length[i] != 2) { error_latch = 1; } break;
case 23: error_latch = 2; break;
case 24: error_latch = 2; break;
case 25: error_latch = 2; break;
case 39: error_latch = 2; break;
case 40: error_latch = 2; break;
case 41: error_latch = 2; break;
case 42: error_latch = 2; break;
case 70: error_latch = 2; break;
case 80: error_latch = 2; break;
case 23:
case 24:
case 25:
case 39:
case 40:
case 41:
case 42:
case 70:
case 80:
case 81: error_latch = 2; break;
}
if((ai_value[i] >= 100) && (ai_value[i] <= 179)) { error_latch = 2; }
if((ai_value[i] >= 1000) && (ai_value[i] <= 1799)) { error_latch = 2; }
if((ai_value[i] >= 200) && (ai_value[i] <= 229)) { error_latch = 2; }
if((ai_value[i] >= 2000) && (ai_value[i] <= 2299)) { error_latch = 2; }
if((ai_value[i] >= 300) && (ai_value[i] <= 309)) { error_latch = 2; }
if((ai_value[i] >= 3000) && (ai_value[i] <= 3099)) { error_latch = 2; }
if((ai_value[i] >= 31) && (ai_value[i] <= 36)) { error_latch = 2; }
if((ai_value[i] >= 310) && (ai_value[i] <= 369)) { error_latch = 2; }
if((ai_value[i] >= 3100) && (ai_value[i] <= 3699)) { if(data_length[i] != 6) { error_latch = 1; } }
if((ai_value[i] >= 370) && (ai_value[i] <= 379)) { error_latch = 2; }
if((ai_value[i] >= 3700) && (ai_value[i] <= 3799)) { error_latch = 2; }
if((ai_value[i] >= 410) && (ai_value[i] <= 415)) { if(data_length[i] != 13) { error_latch = 1; } }
if((ai_value[i] >= 4100) && (ai_value[i] <= 4199)) { error_latch = 2; }
if((ai_value[i] >= 700) && (ai_value[i] <= 703)) { error_latch = 2; }
if((ai_value[i] >= 800) && (ai_value[i] <= 810)) { error_latch = 2; }
if((ai_value[i] >= 900) && (ai_value[i] <= 999)) { error_latch = 2; }
if((ai_value[i] >= 9000) && (ai_value[i] <= 9999)) { error_latch = 2; }
if(
((ai_value[i] >= 100) && (ai_value[i] <= 179))
|| ((ai_value[i] >= 1000) && (ai_value[i] <= 1799))
|| ((ai_value[i] >= 200) && (ai_value[i] <= 229))
|| ((ai_value[i] >= 2000) && (ai_value[i] <= 2299))
|| ((ai_value[i] >= 300) && (ai_value[i] <= 309))
|| ((ai_value[i] >= 3000) && (ai_value[i] <= 3099))
|| ((ai_value[i] >= 31) && (ai_value[i] <= 36))
|| ((ai_value[i] >= 310) && (ai_value[i] <= 369))
) {
error_latch = 2;
}
if((ai_value[i] >= 3100) && (ai_value[i] <= 3699)) {
if(data_length[i] != 6) {
error_latch = 1;
}
}
if(
((ai_value[i] >= 370) && (ai_value[i] <= 379))
|| ((ai_value[i] >= 3700) && (ai_value[i] <= 3799))
) {
error_latch = 2;
}
if((ai_value[i] >= 410) && (ai_value[i] <= 415)) {
if(data_length[i] != 13) {
error_latch = 1;
}
}
if(
((ai_value[i] >= 4100) && (ai_value[i] <= 4199))
|| ((ai_value[i] >= 700) && (ai_value[i] <= 703))
|| ((ai_value[i] >= 800) && (ai_value[i] <= 810))
|| ((ai_value[i] >= 900) && (ai_value[i] <= 999))
|| ((ai_value[i] >= 9000) && (ai_value[i] <= 9999))
) {
error_latch = 2;
}
if((error_latch < 4) && (error_latch > 0)) {
/* error has just been detected: capture AI */
itostr(ai_string, ai_value[i]);
@ -251,11 +271,15 @@ int gs1_verify(struct zint_symbol *symbol, unsigned char source[], const unsigne
ai_latch = 0;
/* The following values from "GS-1 General Specification version 8.0 issue 2, May 2008"
figure 5.4.8.2.1 - 1 "Element Strings with Pre-Defined Length Using Application Identifiers" */
if((last_ai >= 0) && (last_ai <= 4)) { ai_latch = 1; }
if((last_ai >= 11) && (last_ai <= 20)) { ai_latch = 1; }
if(last_ai == 23) { ai_latch = 1; } /* legacy support - see 5.3.8.2.2 */
if((last_ai >= 31) && (last_ai <= 36)) { ai_latch = 1; }
if(last_ai == 41) { ai_latch = 1; }
if(
((last_ai >= 0) && (last_ai <= 4))
|| ((last_ai >= 11) && (last_ai <= 20))
|| (last_ai == 23) /* legacy support - see 5.3.8.2.2 */
|| ((last_ai >= 31) && (last_ai <= 36))
|| (last_ai == 41)
) {
ai_latch = 1;
}
}
/* The ']' character is simply dropped from the input */
}