[zbar-commits] push rev [288]: rename dprintf macro to avoid conflicts (patch #3128538)
Status: Beta
Brought to you by:
spadix
Menu
▾
▴
[zbar-commits] push rev [288]: rename dprintf macro to avoid conflicts (patch #3128538)
|
From: <sp...@us...> - 2011-01-16 19:47:18
|
changeset: 288:74eeb4494438 user: sp...@us... date: Sun Jan 16 11:46:28 2011 -0800 details: http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/74eeb4494438 description: rename dprintf macro to avoid conflicts (patch #3128538) - thanks to maurochehab for the patch! diffstat: ChangeLog | 2 + zbar/debug.h | 8 +- zbar/decoder.c | 2 +- zbar/decoder.h | 2 +- zbar/decoder/code128.c | 54 +++++++++--------- zbar/decoder/code39.c | 44 +++++++------- zbar/decoder/code93.c | 50 ++++++++-------- zbar/decoder/databar.c | 138 +++++++++++++++++++++++----------------------- zbar/decoder/ean.c | 128 +++++++++++++++++++++--------------------- zbar/decoder/i25.c | 44 +++++++------- zbar/decoder/pdf417.c | 34 +++++----- zbar/decoder/qr_finder.c | 18 +++--- zbar/scanner.c | 30 +++++----- 13 files changed, 278 insertions(+), 276 deletions(-) diffs (truncated from 1884 to 300 lines): diff -r 9f373264f57b -r 74eeb4494438 ChangeLog --- a/ChangeLog Fri Dec 31 14:32:11 2010 -0500 +++ b/ChangeLog Sun Jan 16 11:46:28 2011 -0800 @@ -1,4 +1,6 @@ current: + * rename dprintf macro to avoid conflicts (patch #3128538) + - thanks to maurochehab for the patch! * add support for EAN/UPC 2 and 5 digit add-on symbols - deprecate original, unfinished add-on APIs - add self-checking to test_decode diff -r 9f373264f57b -r 74eeb4494438 zbar/debug.h --- a/zbar/debug.h Fri Dec 31 14:32:11 2010 -0500 +++ b/zbar/debug.h Sun Jan 16 11:46:28 2011 -0800 @@ -29,21 +29,21 @@ # ifdef __GNUC__ /* older versions of gcc (< 2.95) require a named varargs parameter */ -# define dprintf(args...) while(0) +# define dbprintf(args...) while(0) # else /* unfortunately named vararg parameter is a gcc-specific extension */ -# define dprintf(...) while(0) +# define dbprintf(...) while(0) # endif #else # ifdef __GNUC__ -# define dprintf(level, args...) do { \ +# define dbprintf(level, args...) do { \ if((level) <= DEBUG_LEVEL) \ fprintf(stderr, args); \ } while(0) # else -# define dprintf(level, ...) do { \ +# define dbprintf(level, ...) do { \ if((level) <= DEBUG_LEVEL) \ fprintf(stderr, __VA_ARGS__); \ } while(0) diff -r 9f373264f57b -r 74eeb4494438 zbar/decoder.c --- a/zbar/decoder.c Fri Dec 31 14:32:11 2010 -0500 +++ b/zbar/decoder.c Sun Jan 16 11:46:28 2011 -0800 @@ -220,7 +220,7 @@ zbar_symbol_type_t tmp, sym = ZBAR_NONE; dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w; - dprintf(1, " decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.)); + dbprintf(1, " decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.)); /* update shared character width */ dcode->s6 -= get_width(dcode, 7); diff -r 9f373264f57b -r 74eeb4494438 zbar/decoder.h --- a/zbar/decoder.h Fri Dec 31 14:32:11 2010 -0500 +++ b/zbar/decoder.h Sun Jan 16 11:46:28 2011 -0800 @@ -188,7 +188,7 @@ zbar_symbol_type_t req) { if(dcode->lock) { - dprintf(2, " [locked %d]\n", dcode->lock); + dbprintf(2, " [locked %d]\n", dcode->lock); return(1); } dcode->lock = req; diff -r 9f373264f57b -r 74eeb4494438 zbar/decoder/code128.c --- a/zbar/decoder/code128.c Fri Dec 31 14:32:11 2010 -0500 +++ b/zbar/decoder/code128.c Sun Jan 16 11:46:28 2011 -0800 @@ -137,9 +137,9 @@ zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n", sig, offset, base, idx); c = characters[idx]; - dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x", - idx, base, lo_base[base], offset, lo_offset[offset], - (unsigned char)c); + dbprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x", + idx, base, lo_base[base], offset, lo_offset[offset], + (unsigned char)c); return(c); } @@ -152,7 +152,7 @@ ((sig >> 4) & 0x00f0) | ((sig << 4) & 0x0f00) | ((sig << 12) & 0xf000)); - dprintf(2, " rev=%x", rev != 0); + dbprintf(2, " rev=%x", rev != 0); switch(sig) { case 0x0014: idx = 0x0; break; @@ -174,7 +174,7 @@ if(rev) idx += 0xe; c = characters[0x51 + idx]; - dprintf(2, " %02x => %02x", idx, c); + dbprintf(2, " %02x => %02x", idx, c); return(c); } @@ -199,7 +199,7 @@ /* build edge signature of character */ unsigned s = dcode->code128.s6; - dprintf(2, " s=%d", s); + dbprintf(2, " s=%d", s); if(s < 5) return(-1); /* calculate similar edge measurements */ @@ -214,7 +214,7 @@ (decode_e(get_width(dcode, 2) + get_width(dcode, 1), s, 11))); if(sig < 0) return(-1); - dprintf(2, " sig=%04x", sig); + dbprintf(2, " sig=%04x", sig); /* lookup edge signature */ c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig); if(c == -1) @@ -226,7 +226,7 @@ : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5)); bars = bars * 11 * 4 / s; chk = calc_check(c); - dprintf(2, " bars=%d chk=%d", bars, chk); + dbprintf(2, " bars=%d chk=%d", bars, chk); if(chk - 7 > bars || bars > chk + 7) return(-1); @@ -268,10 +268,10 @@ /* and compare to check character */ idx = (dcode128->direction) ? 1 : dcode128->character - 2; check = dcode->buf[idx]; - dprintf(2, " chk=%02x(%02x)", sum, check); + dbprintf(2, " chk=%02x(%02x)", sum, check); err = (sum != check); if(err) - dprintf(1, " [checksum error]\n"); + dbprintf(1, " [checksum error]\n"); return(err); } @@ -330,12 +330,12 @@ unsigned i, j, cexp; unsigned char code = 0, charset; code128_decoder_t *dcode128 = &dcode->code128; - dprintf(2, "\n postproc len=%d", dcode128->character); + dbprintf(2, "\n postproc len=%d", dcode128->character); dcode->modifiers = 0; dcode->direction = 1 - 2 * dcode128->direction; if(dcode128->direction) { /* reverse buffer */ - dprintf(2, " (rev)"); + dbprintf(2, " (rev)"); for(i = 0; i < dcode128->character / 2; i++) { unsigned j = dcode128->character - 1 - i; code = dcode->buf[i]; @@ -357,7 +357,7 @@ charset = code - START_A; cexp = (code == START_C) ? 1 : 0; - dprintf(2, " start=%c", 'A' + charset); + dbprintf(2, " start=%c", 'A' + charset); for(i = 1, j = 0; i < dcode128->character - 2; i++) { unsigned char code = dcode->buf[i]; @@ -380,7 +380,7 @@ charset &= 0x7f; } else { - dprintf(2, " %02x", code); + dbprintf(2, " %02x", code); if(charset & 0x2) { unsigned delta; /* expand character set C to ASCII */ @@ -414,7 +414,7 @@ /*else drop trailing FNC1 */ } else if(code >= START_A) { - dprintf(1, " [truncated]\n"); + dbprintf(1, " [truncated]\n"); return(1); } else { @@ -465,21 +465,21 @@ return(0); dcode128->element = 0; - dprintf(2, " code128[%c%02d+%x]:", - (dcode128->direction) ? '<' : '>', - dcode128->character, dcode128->element); + dbprintf(2, " code128[%c%02d+%x]:", + (dcode128->direction) ? '<' : '>', + dcode128->character, dcode128->element); c = decode6(dcode); if(dcode128->character < 0) { unsigned qz; - dprintf(2, " c=%02x", c); + dbprintf(2, " c=%02x", c); if(c < START_A || c > STOP_REV || c == STOP_FWD) { - dprintf(2, " [invalid]\n"); + dbprintf(2, " [invalid]\n"); return(0); } qz = get_width(dcode, 6); if(qz && qz < (dcode128->s6 * 3) / 4) { - dprintf(2, " [invalid qz %d]\n", qz); + dbprintf(2, " [invalid qz %d]\n", qz); return(0); } /* decoded valid start/stop */ @@ -493,13 +493,13 @@ dcode128->direction = ZBAR_SPACE; dcode128->start = c; dcode128->width = dcode128->s6; - dprintf(2, " dir=%x [valid start]\n", dcode128->direction); + dbprintf(2, " dir=%x [valid start]\n", dcode128->direction); return(0); } else if((c < 0) || ((dcode128->character >= BUFFER_MIN) && size_buf(dcode, dcode128->character + 1))) { - dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n"); + dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n"); if(dcode128->character > 1) release_lock(dcode, ZBAR_CODE128); dcode128->character = -1; @@ -513,7 +513,7 @@ dw = dcode128->s6 - dcode128->width; dw *= 4; if(dw > dcode128->width) { - dprintf(1, " [width var]\n"); + dbprintf(1, " [width var]\n"); if(dcode128->character > 1) release_lock(dcode, ZBAR_CODE128); dcode128->character = -1; @@ -549,17 +549,17 @@ else if(dcode128->character < CFG(*dcode128, ZBAR_CFG_MIN_LEN) || (CFG(*dcode128, ZBAR_CFG_MAX_LEN) > 0 && dcode128->character > CFG(*dcode128, ZBAR_CFG_MAX_LEN))) { - dprintf(2, " [invalid len]\n"); + dbprintf(2, " [invalid len]\n"); sym = ZBAR_NONE; } else - dprintf(2, " [valid end]\n"); + dbprintf(2, " [valid end]\n"); dcode128->character = -1; if(!sym) release_lock(dcode, ZBAR_CODE128); return(sym); } - dprintf(2, "\n"); + dbprintf(2, "\n"); return(0); } diff -r 9f373264f57b -r 74eeb4494438 zbar/decoder/code39.c --- a/zbar/decoder/code39.c Fri Dec 31 14:32:11 2010 -0500 +++ b/zbar/decoder/code39.c Sun Jan 16 11:46:28 2011 -0800 @@ -136,10 +136,10 @@ enc <<= 1; if(E > 6) { enc |= 1; - dprintf(2, "1"); + dbprintf(2, "1"); } else - dprintf(2, "0"); + dbprintf(2, "0"); return(enc); } @@ -180,7 +180,7 @@ zassert(idx < 0x2c, -1, " idx=%x enc=%x s9=%x\n", idx, enc, dcode39->s9); const char39_t *c = &code39_encodings[idx]; - dprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev); + dbprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev); if(enc != c->chk) return(-1); @@ -191,11 +191,11 @@ static inline signed char code39_decode_start (zbar_decoder_t *dcode) { code39_decoder_t *dcode39 = &dcode->code39; - dprintf(2, " s=%d ", dcode39->s9); + dbprintf(2, " s=%d ", dcode39->s9); signed char c = code39_decode9(dcode); if(c != 0x19 && c != 0x2b) { - dprintf(2, "\n"); + dbprintf(2, "\n"); return(ZBAR_NONE); } dcode39->direction ^= (c == 0x19); @@ -203,13 +203,13 @@ /* check leading quiet zone - spec is 10x */ unsigned quiet = get_width(dcode, 9); if(quiet && quiet < dcode39->s9 / 2) { - dprintf(2, " [invalid quiet]\n"); + dbprintf(2, " [invalid quiet]\n"); return(ZBAR_NONE); } |
