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

Report linear symbol errors in composite symbols

Browse Source
This commit is contained in:
hooper114 2009-04-28 15:33:04 +00:00
parent 54adba8542
commit 381d40e9a5
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/composite.c
View File

@ -827,7 +827,7 @@ int cc_binary_string(struct zint_symbol *symbol, char source[], char binary_stri
if (!(((ninety[i] >= '0') && (ninety[i] <= '9')) || ((ninety[i] >= 'A') && (ninety[i] <= 'Z')))) {
if((ninety[i] != '*') && (ninety[i] != ',') && (ninety[i] != '-') && (ninety[i] != '.') && (ninety[i] != '/')) {
/* An Invalid AI 90 character */
strcpy(symbol->errtxt, "Invalid AI 90 data [A1]");
strcpy(symbol->errtxt, "Invalid AI 90 data");
return ERROR_INVALID_DATA;
}
}
@ -1152,7 +1152,7 @@ int cc_binary_string(struct zint_symbol *symbol, char source[], char binary_stri
if(latch == 1) {
/* Invalid characters in input data */
strcpy(symbol->errtxt, "Invalid characters in input data [A2]");
strcpy(symbol->errtxt, "Invalid characters in input data");
return ERROR_INVALID_DATA;
}
@ -1511,7 +1511,7 @@ int cc_binary_string(struct zint_symbol *symbol, char source[], char binary_stri
}
if(strlen(binary_string) > 11805) { /* (2361 * 5) */
strcpy(symbol->errtxt, "Input too long [A3]");
strcpy(symbol->errtxt, "Input too long");
return ERROR_TOO_LONG;
}
@ -1683,12 +1683,12 @@ int composite(struct zint_symbol *symbol, unsigned char source[])
separator_row = 0;
if(strlen(symbol->primary) == 0) {
strcpy(symbol->errtxt, "No primary (linear) message in 2D composite [A4]");
strcpy(symbol->errtxt, "No primary (linear) message in 2D composite");
return ERROR_INVALID_OPTION;
}
if(ustrlen(source) > 2990) {
strcpy(symbol->errtxt, "2D component input data too long [A5]");
strcpy(symbol->errtxt, "2D component input data too long");
return ERROR_TOO_LONG;
}
@ -1701,7 +1701,7 @@ int composite(struct zint_symbol *symbol, unsigned char source[])
if((cc_mode == 3) && (symbol->symbology != BARCODE_EAN128_CC)) {
/* CC-C can only be used with a GS1-128 linear part */
strcpy(symbol->errtxt, "Invalid mode (CC-C only valid with GS1-128 linear component) [A9]");
strcpy(symbol->errtxt, "Invalid mode (CC-C only valid with GS1-128 linear component)");
return ERROR_INVALID_OPTION;
}
@ -1728,6 +1728,12 @@ int composite(struct zint_symbol *symbol, unsigned char source[])
case BARCODE_RSS_EXPSTACK_CC: error_number = rssexpanded(linear, (unsigned char *)symbol->primary); break;
}
if(error_number != 0) {
strcpy(symbol->errtxt, linear->errtxt);
concat(symbol->errtxt, " in linear component");
return error_number;
}
switch(symbol->symbology) {
/* Determine width of 2D component according to ISO/IEC 24723 Table 1 */
case BARCODE_EANX_CC:
@ -1757,10 +1763,6 @@ int composite(struct zint_symbol *symbol, unsigned char source[])
strcpy(binary_string, "");
if(error_number != 0) {
return error_number;
}
if(cc_mode < 1 || cc_mode > 3) { cc_mode = 1; }
if(cc_mode == 1) {