From f8ca218630260dfd735cd551bc4d117d9bcb6cc9 Mon Sep 17 00:00:00 2001 From: tgotic Date: Mon, 17 Jan 2011 19:41:01 +0100 Subject: [PATCH] ERROR_* renamed to ZERROR_* --- backend/maxicode.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/maxicode.c b/backend/maxicode.c index 2a882d6e..bd9a54cd 100644 --- a/backend/maxicode.c +++ b/backend/maxicode.c @@ -71,7 +71,7 @@ void maxi_do_secondary_chk_odd( int ecclen ) datalen = 84; for(j = 0; j < datalen; j += 1) - if ((j % 2) == 1) // odd + if (j & 1) // odd data[(j-1)/2] = maxi_codeword[j + 20]; rs_encode(datalen/2, data, results); @@ -96,7 +96,7 @@ void maxi_do_secondary_chk_even(int ecclen ) rs_init_code(ecclen, 1); for(j = 0; j < datalen + 1; j += 1) - if ((j % 2) == 0) // even + if (!(j & 1)) // even data[j/2] = maxi_codeword[j + 20]; rs_encode(datalen/2, data, results); @@ -128,7 +128,7 @@ int maxi_text_process(int mode, unsigned char source[], int length) int set[144], character[144], i, j, done, count, current_set; if(length > 138) { - return ERROR_TOO_LONG; + return ZERROR_TOO_LONG; } for(i = 0; i < 144; i++) { @@ -452,15 +452,15 @@ int maxi_text_process(int mode, unsigned char source[], int length) } while (i <= 143); if(((mode ==2) || (mode == 3)) && (length > 84)) { - return ERROR_TOO_LONG; + return ZERROR_TOO_LONG; } if(((mode == 4) || (mode == 6)) && (length > 93)) { - return ERROR_TOO_LONG; + return ZERROR_TOO_LONG; } if((mode == 5) && (length > 77)) { - return ERROR_TOO_LONG; + return ZERROR_TOO_LONG; } @@ -598,19 +598,19 @@ int maxicode(struct zint_symbol *symbol, unsigned char source[], int length) if((mode < 2) || (mode > 6)) { /* Only codes 2 to 6 supported */ strcpy(symbol->errtxt, "Invalid Maxicode Mode"); - return ERROR_INVALID_OPTION; + return ZERROR_INVALID_OPTION; } if((mode == 2) || (mode == 3)) { /* Modes 2 and 3 need data in symbol->primary */ if(lp != 15) { strcpy(symbol->errtxt, "Invalid Primary String"); - return ERROR_INVALID_DATA; + return ZERROR_INVALID_DATA; } for(i = 9; i < 15; i++) { /* check that country code and service are numeric */ if((symbol->primary[i] < '0') || (symbol->primary[i] > '9')) { strcpy(symbol->errtxt, "Invalid Primary String"); - return ERROR_INVALID_DATA; + return ZERROR_INVALID_DATA; } } @@ -646,7 +646,7 @@ int maxicode(struct zint_symbol *symbol, unsigned char source[], int length) } i = maxi_text_process(mode, local_source, length); - if(i == ERROR_TOO_LONG ) { + if(i == ZERROR_TOO_LONG ) { strcpy(symbol->errtxt, "Input data too long"); return i; }