Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-18 18:37:07 +00:00
Code Issues Projects Releases Wiki Activity

ERROR_* renamed to ZERROR*

Browse Source
This commit is contained in:
tgotic
2011-01-17 19:33:23 +01:00
parent 0c2742262d
commit 8b66aef7bf
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
backend/composite.c
View File

@@ -71,7 +71,7 @@ int _min(int first, int second) {
/* gets bit in bitString at bitPos */
int getBit(UINT *bitStr, int bitPos) {
return(((bitStr[bitPos/16] & (0x8000>>(bitPos%16))) == 0) ? 0 : 1);
return (bitStr[bitPos >> 4] & (0x8000 >> (bitPos & 15))) ? 1 : 0;
}
/* initialize pwr928 encoding table */
@@ -251,12 +251,15 @@ int cc_a(struct zint_symbol *symbol, char source[], int cc_width)
concat(codebarre, "1");
concat(codebarre, codagemc[offset + dummy[1]]);
concat(codebarre, "1");
if(cc_width == 3) {
concat(codebarre, RAPC[CentreRAP]);
}
if(cc_width >= 2) {
concat(codebarre, "1");
concat(codebarre, codagemc[offset + dummy[2]]);
concat(codebarre, "1");
}
if(CentreRAPStart != 0) {
if(cc_width == 4) {
concat(codebarre, RAPC[CentreRAP]);
}
if(cc_width >= 3) {
@@ -850,7 +853,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if((ninety[i] != '*') && (ninety[i] != ',') && (ninety[i] != '-') && (ninety[i] != '.') && (ninety[i] != '/')) {
/* An Invalid AI 90 character */
strcpy(symbol->errtxt, "Invalid AI 90 data");
return ERROR_INVALID_DATA;
return ZERROR_INVALID_DATA;
}
}
}
@@ -1175,7 +1178,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(latch == 1) {
/* Invalid characters in input data */
strcpy(symbol->errtxt, "Invalid characters in input data");
return ERROR_INVALID_DATA;
return ZERROR_INVALID_DATA;
}
for(i = 0; i < strlen(general_field); i++) {
@@ -1371,7 +1374,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
/* CC-A 2D component - calculate remaining space */
switch(*(cc_width)) {
case 2:
if(binary_length > 167) { return ERROR_TOO_LONG; }
if(binary_length > 167) { return ZERROR_TOO_LONG; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
if(binary_length <= 118) { target_bitsize = 118; }
@@ -1381,7 +1384,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 59) { target_bitsize = 59; }
break;
case 3:
if(binary_length > 167) { return ERROR_TOO_LONG; }
if(binary_length > 167) { return ZERROR_TOO_LONG; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
if(binary_length <= 118) { target_bitsize = 118; }
@@ -1389,7 +1392,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 78) { target_bitsize = 78; }
break;
case 4:
if(binary_length > 197) { return ERROR_TOO_LONG; }
if(binary_length > 197) { return ZERROR_TOO_LONG; }
if(binary_length <= 197) { target_bitsize = 197; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
@@ -1403,7 +1406,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
/* CC-B 2D component - calculated from ISO/IEC 24728 Table 1 */
switch(*(cc_width)) {
case 2:
if(binary_length > 336) { return ERROR_TOO_LONG; }
if(binary_length > 336) { return ZERROR_TOO_LONG; }
if(binary_length <= 336) { target_bitsize = 336; }
if(binary_length <= 296) { target_bitsize = 296; }
if(binary_length <= 256) { target_bitsize = 256; }
@@ -1413,7 +1416,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 56) { target_bitsize = 56; }
break;
case 3:
if(binary_length > 768) { return ERROR_TOO_LONG; }
if(binary_length > 768) { return ZERROR_TOO_LONG; }
if(binary_length <= 768) { target_bitsize = 768; }
if(binary_length <= 648) { target_bitsize = 648; }
if(binary_length <= 536) { target_bitsize = 536; }
@@ -1426,7 +1429,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 32) { target_bitsize = 32; }
break;
case 4:
if(binary_length > 1184) { return ERROR_TOO_LONG; }
if(binary_length > 1184) { return ZERROR_TOO_LONG; }
if(binary_length <= 1184) { target_bitsize = 1184; }
if(binary_length <= 1016) { target_bitsize = 1016; }
if(binary_length <= 840) { target_bitsize = 840; }
@@ -1469,7 +1472,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
codewords_used += 3;
if(codewords_used > symbol->option_3) {
return ERROR_TOO_LONG;
return ZERROR_TOO_LONG;
}
/* *(cc_width) = 0.5 + sqrt((codewords_used) / 3); */
*(cc_width) = (lin_width - 62) / 17;
@@ -1534,7 +1537,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(strlen(binary_string) > 11805) { /* (2361 * 5) */
strcpy(symbol->errtxt, "Input too long");
return ERROR_TOO_LONG;
return ZERROR_TOO_LONG;
}
/* all the code below is repeated from above - it needs to be calculated again because the
@@ -1545,7 +1548,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
/* CC-A 2D component - calculate padding required */
switch(*(cc_width)) {
case 2:
if(binary_length > 167) { return ERROR_TOO_LONG; }
if(binary_length > 167) { return ZERROR_TOO_LONG; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
if(binary_length <= 118) { target_bitsize = 118; }
@@ -1555,7 +1558,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 59) { target_bitsize = 59; }
break;
case 3:
if(binary_length > 167) { return ERROR_TOO_LONG; }
if(binary_length > 167) { return ZERROR_TOO_LONG; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
if(binary_length <= 118) { target_bitsize = 118; }
@@ -1563,7 +1566,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 78) { target_bitsize = 78; }
break;
case 4:
if(binary_length > 197) { return ERROR_TOO_LONG; }
if(binary_length > 197) { return ZERROR_TOO_LONG; }
if(binary_length <= 197) { target_bitsize = 197; }
if(binary_length <= 167) { target_bitsize = 167; }
if(binary_length <= 138) { target_bitsize = 138; }
@@ -1577,7 +1580,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
/* CC-B 2D component */
switch(*(cc_width)) {
case 2:
if(binary_length > 336) { return ERROR_TOO_LONG; }
if(binary_length > 336) { return ZERROR_TOO_LONG; }
if(binary_length <= 336) { target_bitsize = 336; }
if(binary_length <= 296) { target_bitsize = 296; }
if(binary_length <= 256) { target_bitsize = 256; }
@@ -1587,7 +1590,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 56) { target_bitsize = 56; }
break;
case 3:
if(binary_length > 768) { return ERROR_TOO_LONG; }
if(binary_length > 768) { return ZERROR_TOO_LONG; }
if(binary_length <= 768) { target_bitsize = 768; }
if(binary_length <= 648) { target_bitsize = 648; }
if(binary_length <= 536) { target_bitsize = 536; }
@@ -1600,7 +1603,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
if(binary_length <= 32) { target_bitsize = 32; }
break;
case 4:
if(binary_length > 1184) { return ERROR_TOO_LONG; }
if(binary_length > 1184) { return ZERROR_TOO_LONG; }
if(binary_length <= 1184) { target_bitsize = 1184; }
if(binary_length <= 1016) { target_bitsize = 1016; }
if(binary_length <= 840) { target_bitsize = 840; }
@@ -1643,7 +1646,7 @@ int cc_binary_string(struct zint_symbol *symbol, const char source[], char binar
codewords_used += 3;
if(codewords_used > symbol->option_3) {
return ERROR_TOO_LONG;
return ZERROR_TOO_LONG;
}
/* *(cc_width) = 0.5 + sqrt((codewords_used) / 3); */
*(cc_width) = (lin_width - 62) / 17;
@@ -1756,12 +1759,12 @@ int composite(struct zint_symbol *symbol, unsigned char source[], int length)
pri_len = strlen(symbol->primary);
if(pri_len == 0) {
strcpy(symbol->errtxt, "No primary (linear) message in 2D composite");
return ERROR_INVALID_OPTION;
return ZERROR_INVALID_OPTION;
}
if(length > 2990) {
strcpy(symbol->errtxt, "2D component input data too long");
return ERROR_TOO_LONG;
return ZERROR_TOO_LONG;
}
linear = ZBarcode_Create(); /* Symbol contains the 2D component and Linear contains the rest */
@@ -1774,7 +1777,7 @@ int composite(struct zint_symbol *symbol, unsigned char source[], int length)
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)");
return ERROR_INVALID_OPTION;
return ZERROR_INVALID_OPTION;
}
linear->symbology = symbol->symbology;
@@ -1839,16 +1842,16 @@ int composite(struct zint_symbol *symbol, unsigned char source[], int length)
if(cc_mode == 1) {
i = cc_binary_string(symbol, reduced, binary_string, cc_mode, &cc_width, &ecc_level, linear->width);
if (i == ERROR_TOO_LONG) {
if (i == ZERROR_TOO_LONG) {
cc_mode = 2;
}
}
if(cc_mode == 2) { /* If the data didn't fit into CC-A it is recalculated for CC-B */
i = cc_binary_string(symbol, reduced, binary_string, cc_mode, &cc_width, &ecc_level, linear->width);
if (i == ERROR_TOO_LONG) {
if (i == ZERROR_TOO_LONG) {
if(symbol->symbology != BARCODE_EAN128_CC) {
return ERROR_TOO_LONG;
return ZERROR_TOO_LONG;
} else {
cc_mode = 3;
}
@@ -1858,8 +1861,8 @@ int composite(struct zint_symbol *symbol, unsigned char source[], int length)
if(cc_mode == 3) { /* If the data didn't fit in CC-B (and linear part is GS1-128) it is recalculated
for CC-C */
i = cc_binary_string(symbol, reduced, binary_string, cc_mode, &cc_width, &ecc_level, linear->width);
if (i == ERROR_TOO_LONG) {
return ERROR_TOO_LONG;
if (i == ZERROR_TOO_LONG) {
return ZERROR_TOO_LONG;
}
}
@@ -1870,7 +1873,7 @@ int composite(struct zint_symbol *symbol, unsigned char source[], int length)
}
if(error_number != 0) {
return ERROR_ENCODING_PROBLEM;
return ZERROR_ENCODING_PROBLEM;
}
/* Merge the linear component with the 2D component */