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

Add verbose mode to output debug info without recompiling

Browse Source
This commit is contained in:
Robin Stuart 2017-04-11 10:05:38 +01:00
parent 5acbffff0d
commit 6f4610aa98
11 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/aztec.c
View File

@ -68,9 +68,9 @@ static void insert(char binary_string[], const size_t posn, const char newbit) {
/** /**
* Encode input data into a binary string * Encode input data into a binary string
*/ */
static int aztec_text_process(const unsigned char source[], const unsigned int src_len, char binary_string[], const int gs1, const int eci) { static int aztec_text_process(const unsigned char source[], const unsigned int src_len, char binary_string[], const int gs1, const int eci, int debug) {
int i, j, k, p, bytes; int i, j, k, p, bytes;
int curtable, newtable, lasttable, chartype, maplength, blocks, debug; int curtable, newtable, lasttable, chartype, maplength, blocks;
#ifndef _MSC_VER #ifndef _MSC_VER
int charmap[src_len * 2], typemap[src_len * 2]; int charmap[src_len * 2], typemap[src_len * 2];
int blockmap[2][src_len]; int blockmap[2][src_len];
@ -83,7 +83,6 @@ static int aztec_text_process(const unsigned char source[], const unsigned int s
#endif #endif
/* Lookup input string in encoding table */ /* Lookup input string in encoding table */
maplength = 0; maplength = 0;
debug = 0;
if (gs1) { if (gs1) {
/* Add FNC1 to beginning of GS1 messages */ /* Add FNC1 to beginning of GS1 messages */
@ -886,7 +885,7 @@ int aztec(struct zint_symbol *symbol, unsigned char source[], int length) {
unsigned char desc_data[4], desc_ecc[6]; unsigned char desc_data[4], desc_ecc[6];
int err_code, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length; int err_code, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length;
int remainder, padbits, count, gs1, adjustment_size; int remainder, padbits, count, gs1, adjustment_size;
int debug = 0, reader = 0; int debug = symbol->debug, reader = 0;
int comp_loop = 4; int comp_loop = 4;
#ifdef _MSC_VER #ifdef _MSC_VER
@ -913,7 +912,7 @@ int aztec(struct zint_symbol *symbol, unsigned char source[], int length) {
populate_map(); populate_map();
err_code = aztec_text_process(source, length, binary_string, gs1, symbol->eci); err_code = aztec_text_process(source, length, binary_string, gs1, symbol->eci, symbol->debug);
if (err_code != 0) { if (err_code != 0) {
strcpy(symbol->errtxt, "Input too long or too many extended ASCII characters (E02)"); strcpy(symbol->errtxt, "Input too long or too many extended ASCII characters (E02)");

2
backend/dmatrix.c
View File

@ -536,7 +536,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
int sp, tp, i, gs1; int sp, tp, i, gs1;
int current_mode, next_mode; int current_mode, next_mode;
int inputlen = *length_p; int inputlen = *length_p;
int debug = 0; int debug = symbol->debug;
#ifndef _MSC_VER #ifndef _MSC_VER
char binary[2 * inputlen]; char binary[2 * inputlen];
#else #else

2
backend/dotcode.c
View File

@ -367,7 +367,7 @@ int dotcode_encode_message(struct zint_symbol *symbol, const unsigned char sourc
int input_position, array_length, i; int input_position, array_length, i;
char encoding_mode; char encoding_mode;
int inside_macro, done; int inside_macro, done;
int debug = 0; int debug = symbol->debug;
int binary_buffer_size = 0; int binary_buffer_size = 0;
int lawrencium[6]; // Reversed radix 103 values int lawrencium[6]; // Reversed radix 103 values

6
backend/gridmtx.c
View File

@ -348,7 +348,7 @@ void add_shift_char(char binary[], int shifty) {
} }
} }
int gm_encode(int gbdata[], int length, char binary[], int reader, int eci) { int gm_encode(int gbdata[], int length, char binary[], int reader, int eci, int debug) {
/* Create a binary stream representation of the input data. /* Create a binary stream representation of the input data.
7 sets are defined - Chinese characters, Numerals, Lower case letters, Upper case letters, 7 sets are defined - Chinese characters, Numerals, Lower case letters, Upper case letters,
Mixed numerals and latters, Control characters and 8-bit binary data */ Mixed numerals and latters, Control characters and 8-bit binary data */
@ -357,7 +357,7 @@ int gm_encode(int gbdata[], int length, char binary[], int reader, int eci) {
int p = 0, ppos; int p = 0, ppos;
int numbuf[3], punt = 0; int numbuf[3], punt = 0;
size_t number_pad_posn, byte_count_posn = 0; size_t number_pad_posn, byte_count_posn = 0;
int byte_count = 0, debug = 0; int byte_count = 0;
int shift, i; int shift, i;
strcpy(binary, ""); strcpy(binary, "");
@ -1098,7 +1098,7 @@ int grid_matrix(struct zint_symbol *symbol, const unsigned char source[], int le
if (symbol->output_options & READER_INIT) reader = 1; if (symbol->output_options & READER_INIT) reader = 1;
error_number = gm_encode(gbdata, length, binary, reader, symbol->eci); error_number = gm_encode(gbdata, length, binary, reader, symbol->eci, symbol->debug);
if (error_number != 0) { if (error_number != 0) {
strcpy(symbol->errtxt, "Input data too long (E31)"); strcpy(symbol->errtxt, "Input data too long (E31)");
return error_number; return error_number;

5
backend/hanxin.c
View File

@ -328,11 +328,10 @@ int lookup_text2(char input) {
} }
/* Convert input data to binary stream */ /* Convert input data to binary stream */
void calculate_binary(char binary[], char mode[], int source[], int length, int eci) { void calculate_binary(char binary[], char mode[], int source[], int length, int eci, int debug) {
int block_length; int block_length;
int position = 0; int position = 0;
int i, p, count, encoding_value; int i, p, count, encoding_value;
int debug = 0;
int first_byte, second_byte; int first_byte, second_byte;
int third_byte, fourth_byte; int third_byte, fourth_byte;
int glyph; int glyph;
@ -1396,7 +1395,7 @@ int han_xin(struct zint_symbol *symbol, const unsigned char source[], int length
ecc_level = 1; ecc_level = 1;
} }
calculate_binary(binary, mode, gbdata, length, symbol->eci); calculate_binary(binary, mode, gbdata, length, symbol->eci, symbol->debug);
bin_len = strlen(binary); bin_len = strlen(binary);
codewords = bin_len / 8; codewords = bin_len / 8;
if (bin_len % 8 != 0) { if (bin_len % 8 != 0) {

1
backend/library.c
View File

@ -72,6 +72,7 @@ struct zint_symbol *ZBarcode_Create() {
symbol->bitmap_height = 0; symbol->bitmap_height = 0;
symbol->eci = 3; symbol->eci = 3;
symbol->dot_size = 4.0 / 5.0; symbol->dot_size = 4.0 / 5.0;
symbol->debug = 0;
return symbol; return symbol;
} }

2
backend/pdf417.c
View File

@ -561,7 +561,7 @@ int pdf417(struct zint_symbol *symbol, unsigned char chaine[], int length) {
int i, k, j, indexchaine, indexliste, mode, longueur, loop, mccorrection[520], offset; int i, k, j, indexchaine, indexliste, mode, longueur, loop, mccorrection[520], offset;
int total, chainemc[2700], mclength, c1, c2, c3, dummy[35], codeerr; int total, chainemc[2700], mclength, c1, c2, c3, dummy[35], codeerr;
char codebarre[140], pattern[580]; char codebarre[140], pattern[580];
int debug = 0; int debug = symbol->debug;
codeerr = 0; codeerr = 0;

12
backend/qr.c
View File

@ -197,8 +197,8 @@ static void qr_bscan(char *binary, int data, int h) {
} }
/* Convert input data to a binary stream and add padding */ /* Convert input data to a binary stream and add padding */
void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1, int eci, int est_binlen) { void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1, int eci, int est_binlen, int debug) {
int position = 0, debug = 0; int position = 0;
int short_data_block_length, i, scheme = 1; int short_data_block_length, i, scheme = 1;
char data_block, padbits; char data_block, padbits;
int current_binlen, current_bytes; int current_binlen, current_bytes;
@ -1672,7 +1672,7 @@ int qr_code(struct zint_symbol *symbol, const unsigned char source[], int length
fullstream = (int *) _alloca((qr_total_codewords[version - 1] + 1) * sizeof (int)); fullstream = (int *) _alloca((qr_total_codewords[version - 1] + 1) * sizeof (int));
#endif #endif
qr_binary(datastream, version, target_binlen, mode, jisdata, length, gs1, symbol->eci, est_binlen); qr_binary(datastream, version, target_binlen, mode, jisdata, length, gs1, symbol->eci, est_binlen, symbol->debug);
add_ecc(fullstream, datastream, version, target_binlen, blocks); add_ecc(fullstream, datastream, version, target_binlen, blocks);
size = qr_sizes[version - 1]; size = qr_sizes[version - 1];
@ -1718,10 +1718,10 @@ int qr_code(struct zint_symbol *symbol, const unsigned char source[], int length
/* NOTE: From this point forward concerns Micro QR Code only */ /* NOTE: From this point forward concerns Micro QR Code only */
int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length, int *kanji_used, int *alphanum_used, int *byte_used) { int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length, int *kanji_used, int *alphanum_used, int *byte_used, int debug) {
/* Convert input data to an "intermediate stage" where data is binary encoded but /* Convert input data to an "intermediate stage" where data is binary encoded but
control information is not */ control information is not */
int position = 0, debug = 0; int position = 0;
int short_data_block_length, i; int short_data_block_length, i;
char data_block; char data_block;
char buffer[2]; char buffer[2];
@ -2707,7 +2707,7 @@ int microqr(struct zint_symbol *symbol, const unsigned char source[], int length
} }
} }
error_number = micro_qr_intermediate(binary_stream, jisdata, mode, length, &kanji_used, &alphanum_used, &byte_used); error_number = micro_qr_intermediate(binary_stream, jisdata, mode, length, &kanji_used, &alphanum_used, &byte_used, symbol->debug);
if (error_number != 0) { if (error_number != 0) {
strcpy(symbol->errtxt, "Input data too long (E64)"); strcpy(symbol->errtxt, "Input data too long (E64)");
return error_number; return error_number;

2
backend/rss.c
View File

@ -1169,7 +1169,7 @@ int general_rules(char field[], char type[]) {
/* Handles all data encodation from section 7.2.5 of ISO/IEC 24724 */ /* Handles all data encodation from section 7.2.5 of ISO/IEC 24724 */
int rss_binary_string(struct zint_symbol *symbol, char source[], char binary_string[]) { int rss_binary_string(struct zint_symbol *symbol, char source[], char binary_string[]) {
int encoding_method, i, mask, j, read_posn, latch, debug = 0, last_mode = ISOIEC; int encoding_method, i, mask, j, read_posn, latch, debug = symbol->debug, last_mode = ISOIEC;
int symbol_characters, characters_per_row; int symbol_characters, characters_per_row;
#ifndef _MSC_VER #ifndef _MSC_VER
char general_field[strlen(source) + 1], general_field_type[strlen(source) + 1]; char general_field[strlen(source) + 1], general_field_type[strlen(source) + 1];

1
backend/zint.h
View File

@ -96,6 +96,7 @@ extern "C" {
unsigned int bitmap_byte_length; unsigned int bitmap_byte_length;
float dot_size; float dot_size;
struct zint_render *rendered; struct zint_render *rendered;
int debug;
}; };
#define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MAJOR 2

4
frontend/main.c
View File

@ -493,6 +493,7 @@ int main(int argc, char **argv) {
{"dotsize", 1, 0, 0}, {"dotsize", 1, 0, 0},
{"eci", 1, 0, 0}, {"eci", 1, 0, 0},
{"filetype", 1, 0, 0}, {"filetype", 1, 0, 0},
{"verbose", 0, 0, 0}, // Currently undocumented, output some debug info
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
c = getopt_long(argc, argv, "htb:w:d:o:i:rcmpe", long_options, &option_index); c = getopt_long(argc, argv, "htb:w:d:o:i:rcmpe", long_options, &option_index);
@ -688,6 +689,9 @@ int main(int argc, char **argv) {
fflush(stderr); fflush(stderr);
} }
} }
if (!strcmp(long_options[option_index].name, "verbose")) {
my_symbol->debug = 1;
}
break; break;
case 'h': case 'h':