From ce330147acca10cd66c370847bdc3e824a83a0c6 Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Thu, 8 Oct 2009 16:41:56 +0900 Subject: add qrgen sample app --- lpg/libqr/qrgen.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 lpg/libqr/qrgen.c (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c new file mode 100644 index 0000000..9899373 --- /dev/null +++ b/lpg/libqr/qrgen.c @@ -0,0 +1,210 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qr-bitstream.h" +#include "code-common.h" + +struct config { + int version; + enum qr_ec_level ec; + enum qr_data_type dtype; + int ansi; + const char * input; +}; + +struct qr_code * create(int version, + enum qr_ec_level ec, + enum qr_data_type dtype, + const char * input) +{ + struct qr_data * data; + struct qr_code * code; + size_t len; + + len = strlen(input); + + data = qr_create_data(version, dtype, input, len); + + if (!data) { + /* BUG: this could also indicate OOM or + * some other error. + */ + fprintf(stderr, "Invalid data\n"); + exit(1); + } + + code = qr_code_create(ec, data); + + if (!code) { + perror("Failed to create code"); + qr_free_data(data); + exit(2); + } + + return code; +} + +void output_pbm(const struct qr_bitmap * bmp, const char * comment) +{ + unsigned char * row; + int x, y; + + puts("P1"); + + if (comment) + printf("# %s\n", comment); + + printf("%u %u\n", + (unsigned)bmp->width + 8, + (unsigned)bmp->height + 8); + + row = bmp->bits; + + for (y = -4; y < (int)bmp->height + 4; ++y) { + + if (y < 0 || y >= (int)bmp->height) { + for (x = 0; x < (int)bmp->width + 8; ++x) + printf("0 "); + putchar('\n'); + continue; + } + + printf("0 0 0 0 "); + + for (x = 0; x < (int)bmp->width; ++x) { + + int mask = 1 << x % CHAR_BIT; + int byte = row[x / CHAR_BIT]; + + printf("%c ", (byte & mask) ? '1' : '0'); + } + + puts("0 0 0 0"); + row += bmp->stride; + } +} + +void output_ansi(const struct qr_bitmap * bmp) +{ + const char * out[2] = { + " ", + "\033[7m \033[0m", + }; + + unsigned char * line; + int x, y; + + line = bmp->bits; + + for (y = 0; y < bmp->height; ++y) { + + for (x = 0; x < bmp->width; ++x) { + + int mask = 1 << (x % CHAR_BIT); + int byte = line[x / CHAR_BIT]; + + printf("%s", out[!!(byte & mask)]); + } + + putchar('\n'); + + line += bmp->stride; + } +} + +void show_help() { + fprintf(stderr, "(help message)\n"); +} + +void set_default_config(struct config * conf) +{ + conf->version = 1; + conf->ec = QR_EC_LEVEL_M; + conf->dtype = QR_DATA_NUMERIC; + conf->ansi = 1; + conf->input = "01234567"; +} + +void parse_options(int argc, char ** argv, struct config * conf) +{ + int c; + + for (;;) { + c = getopt(argc, argv, ":?vetap"); + + if (c == -1) /* no more options */ + break; + + switch (c) { + case '?': /* help */ + show_help(); + exit(0); + break; + case 'v': /* version */ + if (!optarg) { + fprintf(stderr, "No version\n"); + exit(1); + } + conf->version = atoi(optarg); + if (conf->version < 1 || conf->version > 40) { + fprintf(stderr, + "Version must be between 1 and 40\n"); + exit(1); + } + break; + case 'e': /* ec */ + fprintf(stderr, "XXX: ignored \"ec\"\n"); break; + case 't': /* type */ + fprintf(stderr, "XXX: ignored \"type\"\n"); break; + case 'a': /* ansi */ + conf->ansi = 1; break; + case 'p': /* pnm */ + conf->ansi = 0; break; + case ':': default: + fprintf(stderr, "Unknown option: \"%s\"\n", + argv[optind]); + exit(1); + break; + } + } + + + if (optind < argc) + conf->input = argv[optind++]; + + if (!conf->input) { + fprintf(stderr, "No data (try -? for help)\n"); + exit(1); + } +} + +int main(int argc, char ** argv) { + + struct config conf; + struct qr_code * code; + + set_default_config(&conf); + parse_options(argc, argv, &conf); + + code = create(conf.version, + conf.ec, + conf.dtype, + conf.input); + + if (conf.ansi) + output_ansi(code->modules); + else + output_pbm(code->modules, "qrgen v0.1"); + + qr_code_destroy(code); + + return 0; +} + -- cgit v1.2.3-70-g09d2 From 0b61708d12b30ce6dc174554794d674eb9f99dad Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Thu, 8 Oct 2009 17:41:19 +0900 Subject: fix option handling --- lpg/libqr/qrgen.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 9899373..8b9f1f0 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -137,39 +137,45 @@ void parse_options(int argc, char ** argv, struct config * conf) int c; for (;;) { - c = getopt(argc, argv, ":?vetap"); + c = getopt(argc, argv, ":hv:e:t:ap"); if (c == -1) /* no more options */ break; switch (c) { - case '?': /* help */ + case 'h': /* help */ show_help(); exit(0); break; case 'v': /* version */ - if (!optarg) { - fprintf(stderr, "No version\n"); - exit(1); - } conf->version = atoi(optarg); if (conf->version < 1 || conf->version > 40) { fprintf(stderr, - "Version must be between 1 and 40\n"); + "Version must be between 1 and 40\n"); exit(1); } break; case 'e': /* ec */ - fprintf(stderr, "XXX: ignored \"ec\"\n"); break; + fprintf(stderr, "XXX: ignored \"ec\"\n"); + break; case 't': /* type */ - fprintf(stderr, "XXX: ignored \"type\"\n"); break; + fprintf(stderr, "XXX: ignored \"type\"\n"); + break; case 'a': /* ansi */ conf->ansi = 1; break; case 'p': /* pnm */ conf->ansi = 0; break; - case ':': default: - fprintf(stderr, "Unknown option: \"%s\"\n", - argv[optind]); + case ':': + fprintf(stderr, + "Argument \"%s\" missing parameter\n", + argv[optind-1]); + exit(1); + break; + case '?': default: + fprintf(stderr, + "Invalid argument: \"%s\"\n" + "Try -h for help\n", + argv[optind-1]); exit(1); break; } @@ -180,7 +186,7 @@ void parse_options(int argc, char ** argv, struct config * conf) conf->input = argv[optind++]; if (!conf->input) { - fprintf(stderr, "No data (try -? for help)\n"); + fprintf(stderr, "No data (try -h for help)\n"); exit(1); } } -- cgit v1.2.3-70-g09d2 From 7ccc90b391c269ce3453275ff8725849ea52ccbe Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Tue, 3 Nov 2009 15:56:27 +0900 Subject: demo app: select ec type, help message --- lpg/libqr/qrgen.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 8b9f1f0..aee6166 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -120,7 +121,14 @@ void output_ansi(const struct qr_bitmap * bmp) } void show_help() { - fprintf(stderr, "(help message)\n"); + fprintf(stderr, + "Usage:\n\t%s [options] \n\n" + "\t-h Display this help message\n" + "\t-v Specify QR version (size) 1 <= n <= 40\n" + "\t-e Specify EC type: L, M, Q, H\n" + "\t-a Output as ANSI graphics (default)\n" + "\t-p Output as PBM\n\n", + "qrgen"); } void set_default_config(struct config * conf) @@ -129,7 +137,7 @@ void set_default_config(struct config * conf) conf->ec = QR_EC_LEVEL_M; conf->dtype = QR_DATA_NUMERIC; conf->ansi = 1; - conf->input = "01234567"; + conf->input = NULL; } void parse_options(int argc, char ** argv, struct config * conf) @@ -156,7 +164,16 @@ void parse_options(int argc, char ** argv, struct config * conf) } break; case 'e': /* ec */ - fprintf(stderr, "XXX: ignored \"ec\"\n"); + switch (tolower(optarg[0])) { + case 'l': conf->ec = QR_EC_LEVEL_L; break; + case 'm': conf->ec = QR_EC_LEVEL_M; break; + case 'q': conf->ec = QR_EC_LEVEL_Q; break; + case 'h': conf->ec = QR_EC_LEVEL_H; break; + default: + fprintf(stderr, + "Invalid EC type (%c). Choose from" + " L, M, Q or H.\n", optarg[0]); + } break; case 't': /* type */ fprintf(stderr, "XXX: ignored \"type\"\n"); -- cgit v1.2.3-70-g09d2 From 682c2c553b7083645dd5147cdf3ff8650f08a0fd Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Sat, 14 Nov 2009 18:13:58 +0900 Subject: Store ec level in qr_data struct --- lpg/libqr/code-create.c | 7 +++---- lpg/libqr/data-common.h | 1 + lpg/libqr/data-create.c | 3 ++- lpg/libqr/qr/code.h | 10 +--------- lpg/libqr/qr/data.h | 8 ++++++++ lpg/libqr/qrgen.c | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/code-create.c b/lpg/libqr/code-create.c index 1a38967..f8ef7b9 100644 --- a/lpg/libqr/code-create.c +++ b/lpg/libqr/code-create.c @@ -274,8 +274,7 @@ fail: goto exit; } -struct qr_code * qr_code_create(enum qr_ec_level ec, - const struct qr_data * data) +struct qr_code * qr_code_create(const struct qr_data * data) { struct qr_code * code; struct qr_bitstream * bits = 0; @@ -294,7 +293,7 @@ struct qr_code * qr_code_create(enum qr_ec_level ec, if (!code->modules) goto fail; - bits = make_data(data->version, ec, data->bits); + bits = make_data(data->version, data->ec, data->bits); if (!bits) goto fail; @@ -313,7 +312,7 @@ struct qr_code * qr_code_create(enum qr_ec_level ec, if (mask < 0) goto fail; - if (draw_functional(code, ec, mask) != 0) + if (draw_functional(code, data->ec, mask) != 0) goto fail; exit: diff --git a/lpg/libqr/data-common.h b/lpg/libqr/data-common.h index bc2b381..420b3b2 100644 --- a/lpg/libqr/data-common.h +++ b/lpg/libqr/data-common.h @@ -7,6 +7,7 @@ struct qr_data { int version; /* 1 ~ 40 */ + enum qr_ec_level ec; struct qr_bitstream * bits; size_t offset; }; diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c index 2c2737f..27c6d4b 100644 --- a/lpg/libqr/data-create.c +++ b/lpg/libqr/data-create.c @@ -3,7 +3,6 @@ */ /** XXX: check that the data will fit! **/ -/** NOTE: should store ec type in qr_data **/ #include #include @@ -174,6 +173,7 @@ static struct qr_data * encode_kanji(struct qr_data * data, } struct qr_data * qr_create_data(int version, + enum qr_ec_level ec, enum qr_data_type type, const char * input, size_t length) @@ -188,6 +188,7 @@ struct qr_data * qr_create_data(int version, return 0; data->version = version; + data->ec = ec; data->bits = qr_bitstream_create(); data->offset = 0; diff --git a/lpg/libqr/qr/code.h b/lpg/libqr/qr/code.h index dba0040..3c14c1f 100644 --- a/lpg/libqr/qr/code.h +++ b/lpg/libqr/qr/code.h @@ -4,15 +4,7 @@ #include #include "types.h" -enum qr_ec_level { - QR_EC_LEVEL_L = 0x1, - QR_EC_LEVEL_M = 0x0, - QR_EC_LEVEL_Q = 0x3, - QR_EC_LEVEL_H = 0x2 -}; - -struct qr_code * qr_code_create(enum qr_ec_level ec, - const struct qr_data * data); +struct qr_code * qr_code_create(const struct qr_data * data); void qr_code_destroy(struct qr_code *); diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h index 5fbdded..39494f4 100644 --- a/lpg/libqr/qr/data.h +++ b/lpg/libqr/qr/data.h @@ -15,7 +15,15 @@ enum qr_data_type { QR_DATA_FNC1 = 9 }; +enum qr_ec_level { + QR_EC_LEVEL_L = 0x1, + QR_EC_LEVEL_M = 0x0, + QR_EC_LEVEL_Q = 0x3, + QR_EC_LEVEL_H = 0x2 +}; + struct qr_data * qr_create_data(int format, /* 1 ~ 40 */ + enum qr_ec_level ec, enum qr_data_type type, const char * input, size_t length); diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index aee6166..d1aae68 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -31,7 +31,7 @@ struct qr_code * create(int version, len = strlen(input); - data = qr_create_data(version, dtype, input, len); + data = qr_create_data(version, ec, dtype, input, len); if (!data) { /* BUG: this could also indicate OOM or @@ -41,7 +41,7 @@ struct qr_code * create(int version, exit(1); } - code = qr_code_create(ec, data); + code = qr_code_create(data); if (!code) { perror("Failed to create code"); -- cgit v1.2.3-70-g09d2 From c157f944cd6db591f5da47475200e5e16b0c2cac Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Sat, 14 Nov 2009 18:43:26 +0900 Subject: Auto-size --- lpg/libqr/TODO | 1 - lpg/libqr/data-common.h | 2 ++ lpg/libqr/data-create.c | 69 ++++++++++++++++++++++++++++++++++++++++++------- lpg/libqr/qr/data.h | 2 +- lpg/libqr/qrgen.c | 2 +- 5 files changed, 63 insertions(+), 13 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/TODO b/lpg/libqr/TODO index eb35da8..0511b22 100644 --- a/lpg/libqr/TODO +++ b/lpg/libqr/TODO @@ -1,4 +1,3 @@ -* Auto-sizing for data * Sample app * Merge some files * Fix XXX, TODO diff --git a/lpg/libqr/data-common.h b/lpg/libqr/data-common.h index 420b3b2..054d349 100644 --- a/lpg/libqr/data-common.h +++ b/lpg/libqr/data-common.h @@ -16,5 +16,7 @@ extern const enum qr_data_type QR_TYPE_CODES[16]; size_t get_size_field_length(int version, enum qr_data_type); +size_t qr_data_dpart_length(enum qr_data_type type, size_t nchars); + #endif diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c index 27c6d4b..37556c6 100644 --- a/lpg/libqr/data-create.c +++ b/lpg/libqr/data-create.c @@ -11,6 +11,8 @@ #include "qr-bitstream.h" #include "data-common.h" +extern const int QR_DATA_WORD_COUNT[40][4]; + static void write_type_and_length(struct qr_data * data, enum qr_data_type type, size_t length) @@ -28,12 +30,7 @@ static struct qr_data * encode_numeric(struct qr_data * data, size_t bits; bits = 4 + get_size_field_length(data->version, QR_DATA_NUMERIC) - + 10 * (length / 3); - - if (length % 3 == 1) - bits += 4; - else if (length % 3 == 2) - bits += 7; + + qr_data_dpart_length(QR_DATA_NUMERIC, length); stream = data->bits; if (qr_bitstream_resize(stream, @@ -106,8 +103,7 @@ static struct qr_data * encode_alpha(struct qr_data * data, size_t bits; bits = 4 + get_size_field_length(data->version, QR_DATA_ALPHA) - + 11 * (length / 2) - + 6 * (length % 2); + + qr_data_dpart_length(QR_DATA_ALPHA, length); stream = data->bits; if (qr_bitstream_resize(stream, @@ -150,7 +146,7 @@ static struct qr_data * encode_8bit(struct qr_data * data, size_t bits; bits = 4 + get_size_field_length(data->version, QR_DATA_8BIT) - + 8 * length; + + qr_data_dpart_length(QR_DATA_8BIT, length); stream = data->bits; if (qr_bitstream_resize(stream, @@ -172,6 +168,24 @@ static struct qr_data * encode_kanji(struct qr_data * data, return 0; } +static int calc_min_version(enum qr_data_type type, + enum qr_ec_level ec, + size_t length) +{ + size_t dbits; + int version; + + dbits = qr_data_dpart_length(type, length); + + for (version = 1; version <= 40; ++version) { + if (4 + dbits + get_size_field_length(version, type) + < 8 * QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]) + return version; + } + + return -1; +} + struct qr_data * qr_create_data(int version, enum qr_ec_level ec, enum qr_data_type type, @@ -179,8 +193,14 @@ struct qr_data * qr_create_data(int version, size_t length) { struct qr_data * data; + int minver; - if (version < 1 || version > 40) + minver = calc_min_version(type, ec, length); + + if (version == 0) + version = minver; + + if (minver < 0 || version < minver) return 0; data = malloc(sizeof(*data)); @@ -222,3 +242,32 @@ struct qr_data * qr_create_data(int version, } } +size_t qr_data_dpart_length(enum qr_data_type type, size_t length) +{ + size_t bits; + + switch (type) { + case QR_DATA_NUMERIC: + bits = 10 * (length / 3); + if (length % 3 == 1) + bits += 4; + else if (length % 3 == 2) + bits += 7; + break; + case QR_DATA_ALPHA: + bits = 11 * (length / 2) + + 6 * (length % 2); + break; + case QR_DATA_8BIT: + bits = 8 * length; + break; + case QR_DATA_KANJI: + /* unsupported */ + default: + /* unsupported; will be ignored */ + bits = 0; + } + + return bits; +} + diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h index 39494f4..34b6968 100644 --- a/lpg/libqr/qr/data.h +++ b/lpg/libqr/qr/data.h @@ -22,7 +22,7 @@ enum qr_ec_level { QR_EC_LEVEL_H = 0x2 }; -struct qr_data * qr_create_data(int format, /* 1 ~ 40 */ +struct qr_data * qr_create_data(int format, /* 1 ~ 40; 0=auto */ enum qr_ec_level ec, enum qr_data_type type, const char * input, diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index d1aae68..cb6d33c 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -133,7 +133,7 @@ void show_help() { void set_default_config(struct config * conf) { - conf->version = 1; + conf->version = 0; conf->ec = QR_EC_LEVEL_M; conf->dtype = QR_DATA_NUMERIC; conf->ansi = 1; -- cgit v1.2.3-70-g09d2 From 2a5548351d9814a8a23eff1e43e14008ea4ae1d0 Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Sat, 14 Nov 2009 18:46:29 +0900 Subject: Default to 8-bit data --- lpg/libqr/TODO | 1 - lpg/libqr/qrgen.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/TODO b/lpg/libqr/TODO index 0511b22..219ca83 100644 --- a/lpg/libqr/TODO +++ b/lpg/libqr/TODO @@ -1,4 +1,3 @@ -* Sample app * Merge some files * Fix XXX, TODO * Tidy code diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index cb6d33c..1309596 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -135,7 +135,7 @@ void set_default_config(struct config * conf) { conf->version = 0; conf->ec = QR_EC_LEVEL_M; - conf->dtype = QR_DATA_NUMERIC; + conf->dtype = QR_DATA_8BIT; conf->ansi = 1; conf->input = NULL; } -- cgit v1.2.3-70-g09d2 From c2e4639d2ebefbeb7f8b7e1826ae2391c6876a5a Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Sat, 14 Nov 2009 20:24:57 +0900 Subject: Merge some files --- lpg/libqr/Makefile | 10 +- lpg/libqr/TODO | 1 - lpg/libqr/bitmap.c | 202 +++++++++++++++++++++++++++++++++++ lpg/libqr/bitstream.c | 243 +++++++++++++++++++++++++++++++++++++++++++ lpg/libqr/capacity.c | 88 ---------------- lpg/libqr/code-common.c | 89 ++++++++-------- lpg/libqr/code-common.h | 18 ---- lpg/libqr/code-create.c | 56 ++-------- lpg/libqr/code-layout.c | 6 +- lpg/libqr/code-layout.h | 14 --- lpg/libqr/code-parse.c | 2 - lpg/libqr/constants.c | 151 +++++++++++++++++++++++++++ lpg/libqr/constants.h | 12 +++ lpg/libqr/data-common.c | 26 +---- lpg/libqr/data-common.h | 22 ---- lpg/libqr/data-create.c | 20 ++-- lpg/libqr/data-parse.c | 16 +-- lpg/libqr/galois.c | 126 ++++++++++++++++++++++ lpg/libqr/galois.h | 12 +++ lpg/libqr/qr-bitmap-render.c | 118 --------------------- lpg/libqr/qr-bitmap.c | 89 ---------------- lpg/libqr/qr-bitstream.c | 243 ------------------------------------------- lpg/libqr/qr-bitstream.h | 48 --------- lpg/libqr/qr-mask.c | 46 -------- lpg/libqr/qr-mask.h | 10 -- lpg/libqr/qr/bitstream.h | 48 +++++++++ lpg/libqr/qr/code.h | 10 ++ lpg/libqr/qr/data.h | 13 ++- lpg/libqr/qr/layout.h | 14 +++ lpg/libqr/qrgen.c | 11 +- lpg/libqr/rs-encode.c | 96 ----------------- lpg/libqr/rs.h | 11 -- 32 files changed, 916 insertions(+), 955 deletions(-) create mode 100644 lpg/libqr/bitmap.c create mode 100644 lpg/libqr/bitstream.c delete mode 100644 lpg/libqr/capacity.c delete mode 100644 lpg/libqr/code-common.h delete mode 100644 lpg/libqr/code-layout.h create mode 100644 lpg/libqr/constants.c create mode 100644 lpg/libqr/constants.h delete mode 100644 lpg/libqr/data-common.h create mode 100644 lpg/libqr/galois.c create mode 100644 lpg/libqr/galois.h delete mode 100644 lpg/libqr/qr-bitmap-render.c delete mode 100644 lpg/libqr/qr-bitmap.c delete mode 100644 lpg/libqr/qr-bitstream.c delete mode 100644 lpg/libqr/qr-bitstream.h delete mode 100644 lpg/libqr/qr-mask.c delete mode 100644 lpg/libqr/qr-mask.h create mode 100644 lpg/libqr/qr/bitstream.h create mode 100644 lpg/libqr/qr/layout.h delete mode 100644 lpg/libqr/rs-encode.c delete mode 100644 lpg/libqr/rs.h (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/Makefile b/lpg/libqr/Makefile index 3a6af6f..a82372f 100644 --- a/lpg/libqr/Makefile +++ b/lpg/libqr/Makefile @@ -1,4 +1,6 @@ -OBJECTS := capacity.o \ +OBJECTS := bitmap.o \ + bitstream.o \ + constants.o \ code-common.o \ code-create.o \ code-layout.o \ @@ -6,11 +8,7 @@ OBJECTS := capacity.o \ data-common.o \ data-create.o \ data-parse.o \ - qr-bitmap.o \ - qr-bitmap-render.o \ - qr-bitstream.o \ - qr-mask.o \ - rs-encode.o + galois.o CFLAGS := -std=c89 -pedantic -I. -Wall CFLAGS += -g diff --git a/lpg/libqr/TODO b/lpg/libqr/TODO index 219ca83..3cd0583 100644 --- a/lpg/libqr/TODO +++ b/lpg/libqr/TODO @@ -1,4 +1,3 @@ -* Merge some files * Fix XXX, TODO * Tidy code * RELEASE v0.1 diff --git a/lpg/libqr/bitmap.c b/lpg/libqr/bitmap.c new file mode 100644 index 0000000..3394784 --- /dev/null +++ b/lpg/libqr/bitmap.c @@ -0,0 +1,202 @@ +#include +#include +#include +#include + +#include + +struct qr_bitmap * qr_bitmap_create(int width, int height, int masked) +{ + struct qr_bitmap * out; + size_t size; + + out = malloc(sizeof(*out)); + if (!out) + goto fail; + + out->width = width; + out->height = height; + out->stride = (width / CHAR_BIT) + (width % CHAR_BIT ? 1 : 0); + + size = out->stride * height; + + out->mask = 0; + out->bits = malloc(size); + if (!out->bits) + goto fail; + memset(out->bits, 0, size); + + if (masked) { + out->mask = malloc(out->stride * width); + if (!out->mask) + goto fail; + memset(out->mask, 0xFF, size); + } + + return out; + +fail: + qr_bitmap_destroy(out); + return 0; +} + +void qr_bitmap_destroy(struct qr_bitmap * bmp) +{ + if (bmp) { + free(bmp->bits); + free(bmp->mask); + free(bmp); + } +} + +struct qr_bitmap * qr_bitmap_clone(const struct qr_bitmap * src) +{ + struct qr_bitmap * bmp; + size_t size; + + bmp = qr_bitmap_create(src->width, src->height, !!src->mask); + if (!bmp) + return 0; + + assert(bmp->stride == src->stride); + + size = bmp->width * bmp->stride; + memcpy(bmp->bits, src->bits, size); + if (bmp->mask) + memcpy(bmp->mask, src->mask, size); + + return bmp; +} + +void qr_bitmap_merge(struct qr_bitmap * dest, const struct qr_bitmap * src) +{ + unsigned char * d, * s, * m; + size_t n; + + assert(dest->stride == src->stride); + assert(dest->height == src->height); + assert(src->mask); + + n = dest->stride * dest->height; + d = dest->bits; + s = src->bits; + m = src->mask; + + while (n--) { + *d &= ~*m; + *d++ |= *s++ & *m++; + } +} + +/* CHAR_BIT | mod_bits (multi-byte) */ +static void render_line_1(unsigned char * out, + const unsigned char * in, + size_t mod_bits, + size_t dim, + unsigned long mark, + unsigned long space) +{ + unsigned char in_mask; + size_t n, b; + + in_mask = 1; + n = dim; + + while (n-- > 0) { + unsigned long v = (*in & in_mask) ? mark : space; + + if ((in_mask <<= 1) == 0) { + in_mask = 1; + ++in; + } + + b = mod_bits / CHAR_BIT; + while (b-- > 0) { + *out++ = (unsigned char) v; + v >>= CHAR_BIT; + } + } +} + +/* mod_bits | CHAR_BIT (packed) */ +static void render_line_2(unsigned char * out, + const unsigned char * in, + size_t mod_bits, + size_t dim, + unsigned long mark, + unsigned long space) +{ + unsigned char in_mask; + size_t n, b, step, shift; + + in_mask = 1; + step = CHAR_BIT / mod_bits; + shift = CHAR_BIT - mod_bits; + n = dim; + + while (n > 0) { + unsigned char tmp = 0; + + b = step; + while (b-- > 0) { + unsigned long v = (*in & in_mask) ? mark : space; + + if ((in_mask <<= 1) == 0) { + in_mask = 1; + ++in; + } + + tmp = (tmp >> mod_bits) | (v << shift); + if (--n == 0) { + tmp >>= b * mod_bits; + break; + } + }; + + *out++ = tmp; + } +} + +void qr_bitmap_render(const struct qr_bitmap * bmp, + void * buffer, + size_t mod_bits, + size_t line_stride, + size_t line_repeat, + unsigned long mark, + unsigned long space) +{ + unsigned char * out; + const unsigned char * in; + size_t n, dim; + int pack; + + pack = (mod_bits < CHAR_BIT); + assert(!pack || (CHAR_BIT % mod_bits == 0)); + assert( pack || (mod_bits % CHAR_BIT == 0)); + + in = bmp->bits; + out = buffer; + dim = bmp->width; + + n = dim; + while (n-- > 0) { + size_t rpt; + unsigned char * next; + + if (pack) + render_line_2(out, in, mod_bits, dim, mark, space); + else + render_line_1(out, in, mod_bits, dim, mark, space); + + rpt = line_repeat; + next = out + line_stride; + while (rpt-- > 0) { + memcpy(next, out, line_stride); + next += line_stride; + } + + in += bmp->stride; + out = next; + } +} + diff --git a/lpg/libqr/bitstream.c b/lpg/libqr/bitstream.c new file mode 100644 index 0000000..cf5a9d4 --- /dev/null +++ b/lpg/libqr/bitstream.c @@ -0,0 +1,243 @@ +/** + * It would perhaps be more sensible just to store the bits + * as an array of char or similar, but this way is more fun. + * This is a pretty inefficient implementation, althought I + * suspect that won't be a problem. + */ + +#include +#include +#include +#include + +#include + +#define MAX(a, b) ((a) < (b) ? (b) : (a)) +#define MIN(a, b) ((a) > (b) ? (b) : (a)) + +struct qr_bitstream { + size_t pos; /* bits */ + size_t count; /* bits */ + size_t bufsiz; /* bytes */ + unsigned char * buffer; +}; + +static size_t bits_to_bytes(size_t bits) +{ + return (bits / CHAR_BIT) + (bits % CHAR_BIT != 0); +} + +static int ensure_available(struct qr_bitstream * stream, size_t bits) +{ + size_t need_bits = stream->pos + bits; + size_t newsize; + + if (stream->bufsiz * CHAR_BIT >= need_bits) + return 0; + + newsize = MAX(stream->bufsiz, 100) * CHAR_BIT; + while (newsize < need_bits) + newsize *= 2; + + return qr_bitstream_resize(stream, newsize); +} + +struct qr_bitstream * qr_bitstream_create(void) +{ + struct qr_bitstream * obj; + + obj = malloc(sizeof(*obj)); + + if (obj) { + obj->pos = 0; + obj->count = 0; + obj->bufsiz = 0; + obj->buffer = 0; + } + + return obj; +} + +int qr_bitstream_resize(struct qr_bitstream * stream, size_t bits) +{ + size_t newsize; + void * newbuf; + + newsize = bits_to_bytes(bits); + newbuf = realloc(stream->buffer, newsize); + + if (newbuf) { + stream->bufsiz = newsize; + stream->buffer = newbuf; + } + + return newbuf ? 0 : -1; +} + +void qr_bitstream_destroy(struct qr_bitstream * stream) +{ + free(stream->buffer); + free(stream); +} + +struct qr_bitstream * qr_bitstream_dup(const struct qr_bitstream * src) +{ + struct qr_bitstream * ret; + + ret = qr_bitstream_create(); + if (!ret) + return 0; + + if (qr_bitstream_resize(ret, src->count) != 0) { + free(ret); + return 0; + } + + ret->pos = src->pos; + ret->count = src->count; + memcpy(ret->buffer, src->buffer, src->bufsiz); + + return ret; +} + +void qr_bitstream_seek(struct qr_bitstream * stream, size_t pos) +{ + assert(pos <= stream->count); + stream->pos = pos; +} + +size_t qr_bitstream_tell(const struct qr_bitstream * stream) +{ + return stream->pos; +} + +size_t qr_bitstream_remaining(const struct qr_bitstream * stream) +{ + return stream->count - stream->pos; +} + +size_t qr_bitstream_size(const struct qr_bitstream * stream) +{ + return stream->count; +} + +unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits) +{ + unsigned int result = 0; + unsigned char * byte; + size_t bitnum; + + assert(qr_bitstream_remaining(stream) >= bits); + + byte = stream->buffer + (stream->pos / CHAR_BIT); + bitnum = stream->pos % CHAR_BIT; + + stream->pos += bits; + + while (bits-- > 0) { + int bit = (*byte >> bitnum++) & 0x1; + result = (result << 1) | bit; + if (bitnum == CHAR_BIT) { + bitnum = 0; + ++byte; + } + } + + return result; +} + +void qr_bitstream_unpack(struct qr_bitstream * stream, + unsigned int * result, + size_t count, + size_t bitsize) +{ + assert(qr_bitstream_remaining(stream) >= (count * bitsize)); + + while (count--) + *(result++) = qr_bitstream_read(stream, bitsize); +} + +int qr_bitstream_write(struct qr_bitstream * stream, + unsigned int value, + size_t bits) +{ + unsigned char * byte; + size_t bitnum; + + if (ensure_available(stream, bits) != 0) + return -1; + + byte = stream->buffer + (stream->pos / CHAR_BIT); + bitnum = stream->pos % CHAR_BIT; + + stream->pos += bits; + stream->count = stream->pos; /* truncate */ + + while (bits-- > 0) { + int bit = (value >> bits) & 0x1; + unsigned char mask = 1 << bitnum++; + *byte = (*byte & ~mask) | (bit ? mask : 0); + if (bitnum == CHAR_BIT) { + bitnum = 0; + ++byte; + } + } + + return 0; +} + +int qr_bitstream_pack(struct qr_bitstream * stream, + const unsigned int * values, + size_t count, + size_t bitsize) +{ + if (ensure_available(stream, count * bitsize) != 0) + return -1; + + while (count--) + qr_bitstream_write(stream, *(values++), bitsize); + + return 0; +} + +int qr_bitstream_cat(struct qr_bitstream * dest, const struct qr_bitstream * src) +{ + size_t count = qr_bitstream_size(src); + size_t srcpos; + + if (ensure_available(dest, count) != 0) + return -1; + + srcpos = qr_bitstream_tell(src); + qr_bitstream_seek((struct qr_bitstream *)src, 0); + qr_bitstream_copy(dest, (struct qr_bitstream *)src, count); + qr_bitstream_seek((struct qr_bitstream *)src, srcpos); + + return 0; +} + +int qr_bitstream_copy(struct qr_bitstream * dest, + struct qr_bitstream * src, + size_t count) +{ + if (qr_bitstream_remaining(src) < count) + return -1; + if (ensure_available(dest, count) != 0) + return -1; + + /* uint must be at least 16 bits */ + for (; count >= 16; count -= 16) + qr_bitstream_write( + dest, + qr_bitstream_read((struct qr_bitstream *)src, 16), + 16); + + if (count > 0) + qr_bitstream_write( + dest, + qr_bitstream_read((struct qr_bitstream *)src, count), + count); + + return 0; +} + diff --git a/lpg/libqr/capacity.c b/lpg/libqr/capacity.c deleted file mode 100644 index 4b513af..0000000 --- a/lpg/libqr/capacity.c +++ /dev/null @@ -1,88 +0,0 @@ -/* FIXME: don't like big tables of data */ - -const int QR_DATA_WORD_COUNT[40][4] = { - 19, 16, 13, 9, - 34, 28, 22, 16, - 55, 44, 34, 26, - 80, 64, 48, 36, - 108, 86, 62, 46, - 136, 108, 76, 60, - 156, 124, 88, 66, - 194, 154, 110, 86, - 232, 182, 132, 100, - 274, 216, 154, 122, - 324, 254, 180, 140, - 370, 290, 206, 158, - 428, 334, 244, 180, - 461, 365, 261, 197, - 523, 415, 295, 223, - 589, 453, 325, 253, - 647, 507, 367, 283, - 721, 563, 397, 313, - 795, 627, 445, 341, - 861, 669, 485, 385, - 932, 714, 512, 406, - 1006, 782, 568, 442, - 1094, 860, 614, 464, - 1174, 914, 664, 514, - 1276, 1000, 718, 538, - 1370, 1062, 754, 596, - 1468, 1128, 808, 628, - 1531, 1193, 871, 661, - 1631, 1267, 911, 701, - 1735, 1373, 985, 745, - 1845, 1455, 1033, 793, - 1955, 1541, 1115, 845, - 2071, 1631, 1171, 901, - 2191, 1725, 1231, 961, - 2306, 1812, 1286, 986, - 2434, 1914, 1351, 1054, - 2566, 1992, 1426, 1096, - 2812, 2216, 1582, 1222, - 2956, 2334, 1666, 1276 -}; - -/* I'm sure we can calculate these values */ -const int QR_RS_BLOCK_COUNT[40][4][2] = { - 1, 0, 1, 0, 1, 0, 1, 0, /* 1 */ - 1, 0, 1, 0, 1, 0, 1, 0, /* 2 */ - 1, 0, 1, 0, 2, 0, 2, 0, /* 3 */ - 1, 0, 2, 0, 2, 0, 4, 0, /* 4 */ - 1, 0, 2, 0, 2, 0, 2, 0, - 2, 0, 4, 0, 4, 0, 4, 0, - 2, 0, 4, 0, 2, 4, 4, 1, - 2, 0, 2, 2, 4, 2, 4, 2, /* 8 */ - 2, 0, 3, 2, 4, 4, 4, 4, - 2, 2, 4, 1, 6, 2, 6, 2, - 4, 0, 1, 4, 4, 4, 3, 8, - 2, 2, 6, 2, 4, 6, 7, 4, - 4, 0, 8, 1, 8, 4, 12, 4, - 3, 1, 4, 5, 11, 5, 11, 5, /* 14 */ - 5, 1, 5, 5, 5, 7, 11, 7, - 5, 1, 7, 3, 15, 2, 3, 13, - 1, 5, 10, 1, 1, 15, 2, 17, - 5, 1, 9, 4, 17, 1, 2, 19, - 3, 4, 3, 11, 17, 4, 9, 16, /* 19 */ - 3, 5, 3, 13, 15, 5, 15, 10, - 4, 4, 17, 0, 17, 6, 19, 6, - 2, 7, 17, 0, 7, 16, 34, 0, - 4, 5, 4, 14, 11, 14, 16, 14, - 6, 4, 6, 14, 11, 16, 30, 2, - 8, 4, 8, 13, 7, 22, 22, 13, /* 25 */ - 10, 2, 19, 4, 28, 6, 33, 4, - 8, 4, 22, 3, 8, 26, 12, 28, - 3, 10, 3, 23, 4, 31, 11, 31, - 7, 7, 21, 7, 1, 37, 19, 26, - 5, 10, 19, 10, 15, 25, 23, 25, /* 30 */ - 13, 3, 2, 29, 42, 1, 23, 28, - 17, 0, 10, 23, 10, 35, 19, 35, - 17, 1, 14, 21, 29, 19, 11, 46, - 13, 6, 14, 23, 44, 7, 59, 1, - 12, 7, 12, 26, 39, 14, 22, 41, /* 35 */ - 6, 14, 6, 34, 46, 10, 2, 64, - 17, 4, 29, 14, 49, 10, 24, 46, - 4, 18, 13, 32, 48, 14, 42, 32, - 20, 4, 40, 7, 43, 22, 10, 67, - 19, 6, 18, 31, 34, 34, 20, 61 /* 40 */ -}; - diff --git a/lpg/libqr/code-common.c b/lpg/libqr/code-common.c index 7c3c119..bc6621a 100644 --- a/lpg/libqr/code-common.c +++ b/lpg/libqr/code-common.c @@ -1,7 +1,10 @@ +#include +#include #include + #include #include -#include "code-common.h" +#include void qr_code_destroy(struct qr_code * code) { @@ -16,7 +19,7 @@ int qr_code_width(const struct qr_code * code) return code->version * 4 + 17; } -size_t code_total_capacity(int version) +size_t qr_code_total_capacity(int version) { int side = version * 4 + 17; @@ -38,46 +41,44 @@ size_t code_total_capacity(int version) return side * side - function_bits; } -const int QR_ALIGNMENT_LOCATION[40][7] = { - { 0, 0, 0, 0, 0, 0, 0 }, /* 1 */ - { 6, 18, 0, 0, 0, 0, 0 }, /* 2 */ - { 6, 22, 0, 0, 0, 0, 0 }, /* 3 */ - { 6, 26, 0, 0, 0, 0, 0 }, /* 4 */ - { 6, 30, 0, 0, 0, 0, 0 }, /* 5 */ - { 6, 34, 0, 0, 0, 0, 0 }, /* 6 */ - { 6, 22, 38, 0, 0, 0, 0 }, /* 7 */ - { 6, 24, 42, 0, 0, 0, 0 }, /* 8 */ - { 6, 26, 46, 0, 0, 0, 0 }, /* 9 */ - { 6, 28, 50, 0, 0, 0, 0 }, /* 10 */ - { 6, 30, 54, 0, 0, 0, 0 }, /* 11 */ - { 6, 32, 58, 0, 0, 0, 0 }, /* 12 */ - { 6, 34, 62, 0, 0, 0, 0 }, /* 13 */ - { 6, 26, 46, 66, 0, 0, 0 }, /* 14 */ - { 6, 26, 48, 70, 0, 0, 0 }, /* 15 */ - { 6, 26, 50, 74, 0, 0, 0 }, /* 16 */ - { 6, 30, 54, 78, 0, 0, 0 }, /* 17 */ - { 6, 30, 56, 82, 0, 0, 0 }, /* 18 */ - { 6, 30, 58, 86, 0, 0, 0 }, /* 19 */ - { 6, 34, 62, 90, 0, 0, 0 }, /* 20 */ - { 6, 28, 50, 72, 94, 0, 0 }, /* 21 */ - { 6, 26, 50, 74, 98, 0, 0 }, /* 22 */ - { 6, 30, 54, 78,102, 0, 0 }, /* 23 */ - { 6, 28, 54, 80,106, 0, 0 }, /* 24 */ - { 6, 32, 58, 84,110, 0, 0 }, /* 25 */ - { 6, 30, 58, 86,114, 0, 0 }, /* 26 */ - { 6, 34, 62, 90,118, 0, 0 }, /* 27 */ - { 6, 26, 50, 74, 98,122, 0 }, /* 28 */ - { 6, 30, 54, 78,102,126, 0 }, /* 29 */ - { 6, 26, 52, 78,104,130, 0 }, /* 30 */ - { 6, 30, 56, 82,108,134, 0 }, /* 31 */ - { 6, 34, 60, 86,112,138, 0 }, /* 32 */ - { 6, 30, 58, 86,114,142, 0 }, /* 33 */ - { 6, 34, 62, 90,118,146, 0 }, /* 34 */ - { 6, 30, 54, 78,102,126,150 }, /* 35 */ - { 6, 24, 50, 76,102,128,154 }, /* 36 */ - { 6, 28, 54, 80,106,132,158 }, /* 37 */ - { 6, 32, 58, 84,110,136,162 }, /* 38 */ - { 6, 26, 54, 82,110,138,166 }, /* 39 */ - { 6, 30, 58, 86,114,142,170 }, /* 40 */ -}; +struct qr_bitmap * qr_mask_apply(const struct qr_bitmap * orig, + unsigned int mask) +{ + struct qr_bitmap * bmp; + int i, j; + + if (mask & ~0x7) + return 0; + + bmp = qr_bitmap_clone(orig); + if (!bmp) + return 0; + + /* Slow version for now; we can optimize later */ + + for (i = 0; i < bmp->height; ++i) { + unsigned char * p = bmp->bits + i * bmp->stride; + + for (j = 0; j < bmp->width; ++j) { + int bit = j % CHAR_BIT; + size_t off = j / CHAR_BIT; + int t; + + switch (mask) { + case 0: t = (i + j) % 2; break; + case 1: t = i % 2; break; + case 2: t = j % 3; break; + case 3: t = (i + j) % 3; break; + case 4: t = (i/2 + j/3) % 2; break; + case 5: t = ((i*j) % 2) + ((i*j) % 3); break; + case 6: t = (((i*j) % 2) + ((i*j) % 3)) % 2; break; + case 7: t = (((i*j) % 3) + ((i+j) % 2)) % 2; break; + } + + p[off] ^= (t == 0) << bit; + } + } + + return bmp; +} diff --git a/lpg/libqr/code-common.h b/lpg/libqr/code-common.h deleted file mode 100644 index 9900e4e..0000000 --- a/lpg/libqr/code-common.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef CODE_COMMON_H -#define CODE_COMMON_H - -#include -#include -#include "qr-bitstream.h" - -struct qr_code { - int version; - struct qr_bitmap * modules; -}; - -size_t code_total_capacity(int version); - -extern const int QR_ALIGNMENT_LOCATION[40][7]; - -#endif - diff --git a/lpg/libqr/code-create.c b/lpg/libqr/code-create.c index f8ef7b9..0882b88 100644 --- a/lpg/libqr/code-create.c +++ b/lpg/libqr/code-create.c @@ -1,19 +1,17 @@ #include #include #include -#include -#include "code-common.h" -#include "code-layout.h" -#include "data-common.h" -#include "qr-mask.h" -#include "rs.h" +#include +#include +#include +#include +#include +#include "constants.h" +#include "galois.h" #define MIN(a, b) ((b) < (a) ? (b) : (a)) -extern const int QR_DATA_WORD_COUNT[40][4]; -extern const int QR_RS_BLOCK_COUNT[40][4][2]; - static int mask_data(struct qr_code * code); static int score_mask(const struct qr_bitmap * bmp); static int score_runs(const struct qr_bitmap * bmp, int base); @@ -28,11 +26,6 @@ static int draw_format(struct qr_bitmap * bmp, int mask); static int calc_format_bits(enum qr_ec_level ec, int mask); static long calc_version_bits(int version); -static unsigned long gal_residue(unsigned long a, unsigned long m); - -/* FIXME: the static functions should be in a better - * order, with prototypes. - */ #include static void x_dump(struct qr_bitstream * bits) @@ -175,7 +168,7 @@ static struct qr_bitstream * make_data(int version, enum qr_ec_level ec, struct qr_bitstream * data) { - const size_t total_bits = code_total_capacity(version); + const size_t total_bits = qr_code_total_capacity(version); const size_t total_words = total_bits / 8; const size_t total_data = QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]; size_t total_blocks, block_count[2], data_words, rs_words; @@ -575,7 +568,7 @@ static int calc_format_bits(enum qr_ec_level ec, int mask) */ bits <<= 15 - 5; - bits |= (unsigned int)gal_residue(bits, 0x537); + bits |= (unsigned int)gf_residue(bits, 0x537); /* XOR mask: 101 0100 0001 0010 */ bits ^= 0x5412; @@ -593,37 +586,8 @@ static long calc_version_bits(int version) * G(x) = x^12 + x^11 + x^10 + x^9 + x^8 + x^5 + x^2 + 1 */ bits <<= 18 - 6; - bits |= gal_residue(bits, 0x1F25); + bits |= gf_residue(bits, 0x1F25); return bits; } -/* Calculate the residue of a modulo m */ -static unsigned long gal_residue(unsigned long a, - unsigned long m) -{ - unsigned long o = 1; - int n = 1; - - /* Find one past the highest bit of the modulus */ - while (m & ~(o - 1)) - o <<= 1; - - /* Find the highest n such that O(m * x^n) <= O(a) */ - while (a & ~(o - 1)) { - o <<= 1; - ++n; - } - - /* For each n, try to reduce a by (m * x^n) */ - while (n--) { - o >>= 1; - - /* o is the highest bit of (m * x^n) */ - if (a & o) - a ^= m << n; - } - - return a; -} - diff --git a/lpg/libqr/code-layout.c b/lpg/libqr/code-layout.c index 2a90124..68a1a0e 100644 --- a/lpg/libqr/code-layout.c +++ b/lpg/libqr/code-layout.c @@ -2,9 +2,11 @@ #include #include #include + #include -#include "code-common.h" -#include "code-layout.h" +#include +#include +#include "constants.h" struct qr_iterator { struct qr_code * code; diff --git a/lpg/libqr/code-layout.h b/lpg/libqr/code-layout.h deleted file mode 100644 index 3390548..0000000 --- a/lpg/libqr/code-layout.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef CODE_LAYOUT_H -#define CODE_LAYOUT_H - -struct qr_iterator; - -void qr_layout_init_mask(struct qr_code *); - -struct qr_iterator * qr_layout_begin(struct qr_code * code); -unsigned int qr_layout_read(struct qr_iterator *); -void qr_layout_write(struct qr_iterator *, unsigned int); -void qr_layout_end(struct qr_iterator *); - -#endif - diff --git a/lpg/libqr/code-parse.c b/lpg/libqr/code-parse.c index 0d3a71d..a794cdc 100644 --- a/lpg/libqr/code-parse.c +++ b/lpg/libqr/code-parse.c @@ -1,7 +1,5 @@ #include -#include "code-common.h" - struct qr_code * qr_code_parse(const void * buffer, size_t line_bits, size_t line_stride, diff --git a/lpg/libqr/constants.c b/lpg/libqr/constants.c new file mode 100644 index 0000000..86f08ff --- /dev/null +++ b/lpg/libqr/constants.c @@ -0,0 +1,151 @@ +#include "constants.h" + +/* FIXME: don't like big tables of data */ + +const int QR_ALIGNMENT_LOCATION[40][7] = { + { 0, 0, 0, 0, 0, 0, 0 }, /* 1 */ + { 6, 18, 0, 0, 0, 0, 0 }, /* 2 */ + { 6, 22, 0, 0, 0, 0, 0 }, /* 3 */ + { 6, 26, 0, 0, 0, 0, 0 }, /* 4 */ + { 6, 30, 0, 0, 0, 0, 0 }, /* 5 */ + { 6, 34, 0, 0, 0, 0, 0 }, /* 6 */ + { 6, 22, 38, 0, 0, 0, 0 }, /* 7 */ + { 6, 24, 42, 0, 0, 0, 0 }, /* 8 */ + { 6, 26, 46, 0, 0, 0, 0 }, /* 9 */ + { 6, 28, 50, 0, 0, 0, 0 }, /* 10 */ + { 6, 30, 54, 0, 0, 0, 0 }, /* 11 */ + { 6, 32, 58, 0, 0, 0, 0 }, /* 12 */ + { 6, 34, 62, 0, 0, 0, 0 }, /* 13 */ + { 6, 26, 46, 66, 0, 0, 0 }, /* 14 */ + { 6, 26, 48, 70, 0, 0, 0 }, /* 15 */ + { 6, 26, 50, 74, 0, 0, 0 }, /* 16 */ + { 6, 30, 54, 78, 0, 0, 0 }, /* 17 */ + { 6, 30, 56, 82, 0, 0, 0 }, /* 18 */ + { 6, 30, 58, 86, 0, 0, 0 }, /* 19 */ + { 6, 34, 62, 90, 0, 0, 0 }, /* 20 */ + { 6, 28, 50, 72, 94, 0, 0 }, /* 21 */ + { 6, 26, 50, 74, 98, 0, 0 }, /* 22 */ + { 6, 30, 54, 78,102, 0, 0 }, /* 23 */ + { 6, 28, 54, 80,106, 0, 0 }, /* 24 */ + { 6, 32, 58, 84,110, 0, 0 }, /* 25 */ + { 6, 30, 58, 86,114, 0, 0 }, /* 26 */ + { 6, 34, 62, 90,118, 0, 0 }, /* 27 */ + { 6, 26, 50, 74, 98,122, 0 }, /* 28 */ + { 6, 30, 54, 78,102,126, 0 }, /* 29 */ + { 6, 26, 52, 78,104,130, 0 }, /* 30 */ + { 6, 30, 56, 82,108,134, 0 }, /* 31 */ + { 6, 34, 60, 86,112,138, 0 }, /* 32 */ + { 6, 30, 58, 86,114,142, 0 }, /* 33 */ + { 6, 34, 62, 90,118,146, 0 }, /* 34 */ + { 6, 30, 54, 78,102,126,150 }, /* 35 */ + { 6, 24, 50, 76,102,128,154 }, /* 36 */ + { 6, 28, 54, 80,106,132,158 }, /* 37 */ + { 6, 32, 58, 84,110,136,162 }, /* 38 */ + { 6, 26, 54, 82,110,138,166 }, /* 39 */ + { 6, 30, 58, 86,114,142,170 }, /* 40 */ +}; + +const int QR_DATA_WORD_COUNT[40][4] = { + { 19, 16, 13, 9 }, + { 34, 28, 22, 16 }, + { 55, 44, 34, 26 }, + { 80, 64, 48, 36 }, + { 108, 86, 62, 46 }, + { 136, 108, 76, 60 }, + { 156, 124, 88, 66 }, + { 194, 154, 110, 86 }, + { 232, 182, 132, 100 }, + { 274, 216, 154, 122 }, + { 324, 254, 180, 140 }, + { 370, 290, 206, 158 }, + { 428, 334, 244, 180 }, + { 461, 365, 261, 197 }, + { 523, 415, 295, 223 }, + { 589, 453, 325, 253 }, + { 647, 507, 367, 283 }, + { 721, 563, 397, 313 }, + { 795, 627, 445, 341 }, + { 861, 669, 485, 385 }, + { 932, 714, 512, 406 }, + { 1006, 782, 568, 442 }, + { 1094, 860, 614, 464 }, + { 1174, 914, 664, 514 }, + { 1276, 1000, 718, 538 }, + { 1370, 1062, 754, 596 }, + { 1468, 1128, 808, 628 }, + { 1531, 1193, 871, 661 }, + { 1631, 1267, 911, 701 }, + { 1735, 1373, 985, 745 }, + { 1845, 1455, 1033, 793 }, + { 1955, 1541, 1115, 845 }, + { 2071, 1631, 1171, 901 }, + { 2191, 1725, 1231, 961 }, + { 2306, 1812, 1286, 986 }, + { 2434, 1914, 1351, 1054 }, + { 2566, 1992, 1426, 1096 }, + { 2812, 2216, 1582, 1222 }, + { 2956, 2334, 1666, 1276 } +}; + +const int QR_RS_BLOCK_COUNT[40][4][2] = { + { 1, 0, 1, 0, 1, 0, 1, 0 }, /* 1 */ + { 1, 0, 1, 0, 1, 0, 1, 0 }, /* 2 */ + { 1, 0, 1, 0, 2, 0, 2, 0 }, /* 3 */ + { 1, 0, 2, 0, 2, 0, 4, 0 }, /* 4 */ + { 1, 0, 2, 0, 2, 0, 2, 0 }, /* 5 */ + { 2, 0, 4, 0, 4, 0, 4, 0 }, /* 6 */ + { 2, 0, 4, 0, 2, 4, 4, 1 }, /* 7 */ + { 2, 0, 2, 2, 4, 2, 4, 2 }, /* 8 */ + { 2, 0, 3, 2, 4, 4, 4, 4 }, /* 9 */ + { 2, 2, 4, 1, 6, 2, 6, 2 }, /* 10 */ + { 4, 0, 1, 4, 4, 4, 3, 8 }, /* 11 */ + { 2, 2, 6, 2, 4, 6, 7, 4 }, /* 12 */ + { 4, 0, 8, 1, 8, 4, 12, 4 }, /* 13 */ + { 3, 1, 4, 5, 11, 5, 11, 5 }, /* 14 */ + { 5, 1, 5, 5, 5, 7, 11, 7 }, /* 15 */ + { 5, 1, 7, 3, 15, 2, 3, 13 }, /* 16 */ + { 1, 5, 10, 1, 1, 15, 2, 17 }, /* 17 */ + { 5, 1, 9, 4, 17, 1, 2, 19 }, /* 18 */ + { 3, 4, 3, 11, 17, 4, 9, 16 }, /* 19 */ + { 3, 5, 3, 13, 15, 5, 15, 10 }, /* 20 */ + { 4, 4, 17, 0, 17, 6, 19, 6 }, /* 21 */ + { 2, 7, 17, 0, 7, 16, 34, 0 }, /* 22 */ + { 4, 5, 4, 14, 11, 14, 16, 14 }, /* 23 */ + { 6, 4, 6, 14, 11, 16, 30, 2 }, /* 24 */ + { 8, 4, 8, 13, 7, 22, 22, 13 }, /* 25 */ + { 10, 2, 19, 4, 28, 6, 33, 4 }, /* 26 */ + { 8, 4, 22, 3, 8, 26, 12, 28 }, /* 27 */ + { 3, 10, 3, 23, 4, 31, 11, 31 }, /* 28 */ + { 7, 7, 21, 7, 1, 37, 19, 26 }, /* 29 */ + { 5, 10, 19, 10, 15, 25, 23, 25 }, /* 30 */ + { 13, 3, 2, 29, 42, 1, 23, 28 }, /* 31 */ + { 17, 0, 10, 23, 10, 35, 19, 35 }, /* 32 */ + { 17, 1, 14, 21, 29, 19, 11, 46 }, /* 33 */ + { 13, 6, 14, 23, 44, 7, 59, 1 }, /* 34 */ + { 12, 7, 12, 26, 39, 14, 22, 41 }, /* 35 */ + { 6, 14, 6, 34, 46, 10, 2, 64 }, /* 36 */ + { 17, 4, 29, 14, 49, 10, 24, 46 }, /* 37 */ + { 4, 18, 13, 32, 48, 14, 42, 32 }, /* 38 */ + { 20, 4, 40, 7, 43, 22, 10, 67 }, /* 39 */ + { 19, 6, 18, 31, 34, 34, 20, 61 } /* 40 */ +}; + +const enum qr_data_type QR_TYPE_CODES[16] = { + QR_DATA_INVALID, /* 0000 */ + QR_DATA_NUMERIC, /* 0001 */ + QR_DATA_ALPHA, /* 0010 */ + QR_DATA_MIXED, /* 0011 */ + QR_DATA_8BIT, /* 0100 */ + QR_DATA_FNC1, /* 0101 */ + QR_DATA_INVALID, /* 0110 */ + QR_DATA_ECI, /* 0111 */ + QR_DATA_KANJI, /* 1000 */ + QR_DATA_FNC1, /* 1001 */ + QR_DATA_INVALID, /* 1010 */ + QR_DATA_INVALID, /* 1011 */ + QR_DATA_INVALID, /* 1100 */ + QR_DATA_INVALID, /* 1101 */ + QR_DATA_INVALID, /* 1110 */ + QR_DATA_INVALID, /* 1111 */ +}; + diff --git a/lpg/libqr/constants.h b/lpg/libqr/constants.h new file mode 100644 index 0000000..15aa515 --- /dev/null +++ b/lpg/libqr/constants.h @@ -0,0 +1,12 @@ +#ifndef QR_CONSTANTS_H +#define QR_CONSTANTS_H + +#include + +extern const int QR_ALIGNMENT_LOCATION[40][7]; +extern const int QR_DATA_WORD_COUNT[40][4]; +extern const int QR_RS_BLOCK_COUNT[40][4][2]; +extern const enum qr_data_type QR_TYPE_CODES[16]; + +#endif + diff --git a/lpg/libqr/data-common.c b/lpg/libqr/data-common.c index ac2f198..8a05f4a 100644 --- a/lpg/libqr/data-common.c +++ b/lpg/libqr/data-common.c @@ -1,27 +1,7 @@ #include -#include - -#include "qr-bitstream.h" -#include "data-common.h" -const enum qr_data_type QR_TYPE_CODES[16] = { - QR_DATA_INVALID, /* 0000 */ - QR_DATA_NUMERIC, /* 0001 */ - QR_DATA_ALPHA, /* 0010 */ - QR_DATA_MIXED, /* 0011 */ - QR_DATA_8BIT, /* 0100 */ - QR_DATA_FNC1, /* 0101 */ - QR_DATA_INVALID, /* 0110 */ - QR_DATA_ECI, /* 0111 */ - QR_DATA_KANJI, /* 1000 */ - QR_DATA_FNC1, /* 1001 */ - QR_DATA_INVALID, /* 1010 */ - QR_DATA_INVALID, /* 1011 */ - QR_DATA_INVALID, /* 1100 */ - QR_DATA_INVALID, /* 1101 */ - QR_DATA_INVALID, /* 1110 */ - QR_DATA_INVALID, /* 1111 */ -}; +#include +#include void qr_free_data(struct qr_data * data) { @@ -29,7 +9,7 @@ void qr_free_data(struct qr_data * data) free(data); } -size_t get_size_field_length(int version, enum qr_data_type type) +size_t qr_data_size_field_length(int version, enum qr_data_type type) { static const size_t QR_SIZE_LENGTHS[3][4] = { { 10, 9, 8, 8 }, diff --git a/lpg/libqr/data-common.h b/lpg/libqr/data-common.h deleted file mode 100644 index 054d349..0000000 --- a/lpg/libqr/data-common.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef DATA_COMMON_H -#define DATA_COMMON_H - -#include - -#include "qr-bitstream.h" - -struct qr_data { - int version; /* 1 ~ 40 */ - enum qr_ec_level ec; - struct qr_bitstream * bits; - size_t offset; -}; - -extern const enum qr_data_type QR_TYPE_CODES[16]; - -size_t get_size_field_length(int version, enum qr_data_type); - -size_t qr_data_dpart_length(enum qr_data_type type, size_t nchars); - -#endif - diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c index 37556c6..9d6c384 100644 --- a/lpg/libqr/data-create.c +++ b/lpg/libqr/data-create.c @@ -2,16 +2,12 @@ * Not "pure" C - only works with ASCII */ -/** XXX: check that the data will fit! **/ - #include #include -#include -#include "qr-bitstream.h" -#include "data-common.h" - -extern const int QR_DATA_WORD_COUNT[40][4]; +#include +#include +#include "constants.h" static void write_type_and_length(struct qr_data * data, enum qr_data_type type, @@ -19,7 +15,7 @@ static void write_type_and_length(struct qr_data * data, { (void)qr_bitstream_write(data->bits, QR_TYPE_CODES[type], 4); (void)qr_bitstream_write(data->bits, length, - get_size_field_length(data->version, type)); + qr_data_size_field_length(data->version, type)); } static struct qr_data * encode_numeric(struct qr_data * data, @@ -29,7 +25,7 @@ static struct qr_data * encode_numeric(struct qr_data * data, struct qr_bitstream * stream = data->bits; size_t bits; - bits = 4 + get_size_field_length(data->version, QR_DATA_NUMERIC) + bits = 4 + qr_data_size_field_length(data->version, QR_DATA_NUMERIC) + qr_data_dpart_length(QR_DATA_NUMERIC, length); stream = data->bits; @@ -102,7 +98,7 @@ static struct qr_data * encode_alpha(struct qr_data * data, struct qr_bitstream * stream = data->bits; size_t bits; - bits = 4 + get_size_field_length(data->version, QR_DATA_ALPHA) + bits = 4 + qr_data_size_field_length(data->version, QR_DATA_ALPHA) + qr_data_dpart_length(QR_DATA_ALPHA, length); stream = data->bits; @@ -145,7 +141,7 @@ static struct qr_data * encode_8bit(struct qr_data * data, struct qr_bitstream * stream = data->bits; size_t bits; - bits = 4 + get_size_field_length(data->version, QR_DATA_8BIT) + bits = 4 + qr_data_size_field_length(data->version, QR_DATA_8BIT) + qr_data_dpart_length(QR_DATA_8BIT, length); stream = data->bits; @@ -178,7 +174,7 @@ static int calc_min_version(enum qr_data_type type, dbits = qr_data_dpart_length(type, length); for (version = 1; version <= 40; ++version) { - if (4 + dbits + get_size_field_length(version, type) + if (4 + dbits + qr_data_size_field_length(version, type) < 8 * QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]) return version; } diff --git a/lpg/libqr/data-parse.c b/lpg/libqr/data-parse.c index 4868cd2..801aa66 100644 --- a/lpg/libqr/data-parse.c +++ b/lpg/libqr/data-parse.c @@ -1,10 +1,10 @@ #include #include #include -#include -#include "qr-bitstream.h" -#include "data-common.h" +#include +#include +#include "constants.h" static enum qr_data_type read_data_type(struct qr_bitstream * stream) { @@ -33,7 +33,7 @@ static enum qr_data_type parse_numeric(const struct qr_data * data, stream = data->bits; buffer = 0; - field_len = get_size_field_length(data->version, QR_DATA_NUMERIC); + field_len = qr_data_size_field_length(data->version, QR_DATA_NUMERIC); if (qr_bitstream_remaining(stream) < field_len) goto invalid; @@ -93,7 +93,7 @@ static enum qr_data_type parse_alpha(const struct qr_data * data, stream = data->bits; buffer = 0; - field_len = get_size_field_length(data->version, QR_DATA_ALPHA); + field_len = qr_data_size_field_length(data->version, QR_DATA_ALPHA); if (qr_bitstream_remaining(stream) < field_len) goto invalid; @@ -150,7 +150,7 @@ static enum qr_data_type parse_8bit(const struct qr_data * data, stream = data->bits; - field_len = get_size_field_length(data->version, QR_DATA_8BIT); + field_len = qr_data_size_field_length(data->version, QR_DATA_8BIT); if (qr_bitstream_remaining(stream) < field_len) return QR_DATA_INVALID; @@ -181,7 +181,7 @@ static enum qr_data_type parse_kanji(const struct qr_data * data, return QR_DATA_INVALID; } -enum qr_data_type qr_get_data_type(const struct qr_data * data) +enum qr_data_type qr_data_type(const struct qr_data * data) { qr_bitstream_seek(data->bits, data->offset); return read_data_type(data->bits); @@ -201,7 +201,7 @@ int qr_get_data_length(const struct qr_data * data) case QR_DATA_ALPHA: case QR_DATA_8BIT: case QR_DATA_KANJI: - field_len = get_size_field_length(data->version, type); + field_len = qr_data_size_field_length(data->version, type); break; default: /* unsupported / invalid */ diff --git a/lpg/libqr/galois.c b/lpg/libqr/galois.c new file mode 100644 index 0000000..e21ce22 --- /dev/null +++ b/lpg/libqr/galois.c @@ -0,0 +1,126 @@ +#include +#include + +#include +#include "galois.h" + +/* Calculate the residue of a modulo m */ +unsigned long gf_residue(unsigned long a, + unsigned long m) +{ + unsigned long o = 1; + int n = 1; + + /* Find one past the highest bit of the modulus */ + while (m & ~(o - 1)) + o <<= 1; + + /* Find the highest n such that O(m * x^n) <= O(a) */ + while (a & ~(o - 1)) { + o <<= 1; + ++n; + } + + /* For each n, try to reduce a by (m * x^n) */ + while (n--) { + o >>= 1; + + /* o is the highest bit of (m * x^n) */ + if (a & o) + a ^= m << n; + } + + return a; +} + +static unsigned int gf_mult(unsigned int a, unsigned int b) +{ + /* Reduce modulo x^8 + x^4 + x^3 + x^2 + 1 + * using the peasant's algorithm + */ + const unsigned int m = 0x11D; + unsigned int x = 0; + int i; + + for (i = 0; i < 8; ++i) { + x ^= (b & 0x1) ? a : 0; + a = (a << 1) ^ ((a & 0x80) ? m : 0); + b >>= 1; + } + + return x & 0xFF; +} + +static unsigned int * make_generator(int k) +{ + unsigned int * g; + unsigned int a; + int i, j; + + g = calloc(k, sizeof(*g)); + if (!g) + return 0; + + g[0] = 1; /* Start with g(x) = 1 */ + a = 1; /* 2^0 = 1 */ + + for (i = 0; i < k; ++i) { + /* Multiply our poly g(x) by (x + 2^i) */ + for (j = k - 1; j > 0; --j) + g[j] = gf_mult(g[j], a) ^ g[j-1]; + g[0] = gf_mult(g[0], a); + + a = gf_mult(a, 2); + } + + return g; +} + +struct qr_bitstream * rs_generate_words(struct qr_bitstream * data, + size_t data_words, + size_t rs_words) +{ + struct qr_bitstream * ec = 0; + unsigned int * b = 0; + unsigned int * g; + size_t n = rs_words; + int i, r; + + assert(qr_bitstream_remaining(data) >= data_words * 8); + + ec = qr_bitstream_create(); + if (!ec) + return 0; + + if (qr_bitstream_resize(ec, n * 8) != 0) + goto fail; + + b = calloc(n, sizeof(*b)); + if (!b) + goto fail; + + g = make_generator(n); + if (!g) + goto fail; + + /* First, prepare the registers (b) with data bits */ + for (i = 0; i < data_words; ++i) { + unsigned int x = b[n-1] ^ qr_bitstream_read(data, 8); + for (r = n-1; r > 0; --r) + b[r] = b[r-1] ^ gf_mult(g[r], x); + b[0] = gf_mult(g[0], x); + } + + /* Read off the registers */ + for (r = 0; r < n; ++r) + qr_bitstream_write(ec, b[(n-1)-r], 8); + + free(g); + free(b); + return ec; +fail: + free(b); + qr_bitstream_destroy(ec); + return 0; +} + diff --git a/lpg/libqr/galois.h b/lpg/libqr/galois.h new file mode 100644 index 0000000..1adeb88 --- /dev/null +++ b/lpg/libqr/galois.h @@ -0,0 +1,12 @@ +#ifndef QR_GALOIS_H +#define QR_GALOIS_H + +unsigned long gf_residue(unsigned long a, + unsigned long m); + +struct qr_bitstream * rs_generate_words(struct qr_bitstream * data, + size_t data_words, + size_t rs_words); + +#endif + diff --git a/lpg/libqr/qr-bitmap-render.c b/lpg/libqr/qr-bitmap-render.c deleted file mode 100644 index 197e947..0000000 --- a/lpg/libqr/qr-bitmap-render.c +++ /dev/null @@ -1,118 +0,0 @@ -#include -#include -#include - -#include - -/* CHAR_BIT | mod_bits (multi-byte) */ -static void render_line_1(unsigned char * out, - const unsigned char * in, - size_t mod_bits, - size_t dim, - unsigned long mark, - unsigned long space) -{ - unsigned char in_mask; - size_t n, b; - - in_mask = 1; - n = dim; - - while (n-- > 0) { - unsigned long v = (*in & in_mask) ? mark : space; - - if ((in_mask <<= 1) == 0) { - in_mask = 1; - ++in; - } - - b = mod_bits / CHAR_BIT; - while (b-- > 0) { - *out++ = (unsigned char) v; - v >>= CHAR_BIT; - } - } -} - -/* mod_bits | CHAR_BIT (packed) */ -static void render_line_2(unsigned char * out, - const unsigned char * in, - size_t mod_bits, - size_t dim, - unsigned long mark, - unsigned long space) -{ - unsigned char in_mask; - size_t n, b, step, shift; - - in_mask = 1; - step = CHAR_BIT / mod_bits; - shift = CHAR_BIT - mod_bits; - n = dim; - - while (n > 0) { - unsigned char tmp = 0; - - b = step; - while (b-- > 0) { - unsigned long v = (*in & in_mask) ? mark : space; - - if ((in_mask <<= 1) == 0) { - in_mask = 1; - ++in; - } - - tmp = (tmp >> mod_bits) | (v << shift); - if (--n == 0) { - tmp >>= b * mod_bits; - break; - } - }; - - *out++ = tmp; - } -} - -void qr_bitmap_render(const struct qr_bitmap * bmp, - void * buffer, - size_t mod_bits, - size_t line_stride, - size_t line_repeat, - unsigned long mark, - unsigned long space) -{ - unsigned char * out; - const unsigned char * in; - size_t n, dim; - int pack; - - pack = (mod_bits < CHAR_BIT); - assert(!pack || (CHAR_BIT % mod_bits == 0)); - assert( pack || (mod_bits % CHAR_BIT == 0)); - - in = bmp->bits; - out = buffer; - dim = bmp->width; - - n = dim; - while (n-- > 0) { - size_t rpt; - unsigned char * next; - - if (pack) - render_line_2(out, in, mod_bits, dim, mark, space); - else - render_line_1(out, in, mod_bits, dim, mark, space); - - rpt = line_repeat; - next = out + line_stride; - while (rpt-- > 0) { - memcpy(next, out, line_stride); - next += line_stride; - } - - in += bmp->stride; - out = next; - } -} - diff --git a/lpg/libqr/qr-bitmap.c b/lpg/libqr/qr-bitmap.c deleted file mode 100644 index 7d2d900..0000000 --- a/lpg/libqr/qr-bitmap.c +++ /dev/null @@ -1,89 +0,0 @@ -#include -#include -#include -#include -#include - -struct qr_bitmap * qr_bitmap_create(int width, int height, int masked) -{ - struct qr_bitmap * out; - size_t size; - - out = malloc(sizeof(*out)); - if (!out) - goto fail; - - out->width = width; - out->height = height; - out->stride = (width / CHAR_BIT) + (width % CHAR_BIT ? 1 : 0); - - size = out->stride * height; - - out->mask = 0; - out->bits = malloc(size); - if (!out->bits) - goto fail; - memset(out->bits, 0, size); - - if (masked) { - out->mask = malloc(out->stride * width); - if (!out->mask) - goto fail; - memset(out->mask, 0xFF, size); - } - - return out; - -fail: - qr_bitmap_destroy(out); - return 0; -} - -void qr_bitmap_destroy(struct qr_bitmap * bmp) -{ - if (bmp) { - free(bmp->bits); - free(bmp->mask); - free(bmp); - } -} - -struct qr_bitmap * qr_bitmap_clone(const struct qr_bitmap * src) -{ - struct qr_bitmap * bmp; - size_t size; - - bmp = qr_bitmap_create(src->width, src->height, !!src->mask); - if (!bmp) - return 0; - - assert(bmp->stride == src->stride); - - size = bmp->width * bmp->stride; - memcpy(bmp->bits, src->bits, size); - if (bmp->mask) - memcpy(bmp->mask, src->mask, size); - - return bmp; -} - -void qr_bitmap_merge(struct qr_bitmap * dest, const struct qr_bitmap * src) -{ - unsigned char * d, * s, * m; - size_t n; - - assert(dest->stride == src->stride); - assert(dest->height == src->height); - assert(src->mask); - - n = dest->stride * dest->height; - d = dest->bits; - s = src->bits; - m = src->mask; - - while (n--) { - *d &= ~*m; - *d++ |= *s++ & *m++; - } -} - diff --git a/lpg/libqr/qr-bitstream.c b/lpg/libqr/qr-bitstream.c deleted file mode 100644 index c752cde..0000000 --- a/lpg/libqr/qr-bitstream.c +++ /dev/null @@ -1,243 +0,0 @@ -/** - * It would perhaps be more sensible just to store the bits - * as an array of char or similar, but this way is more fun. - * This is a pretty inefficient implementation, althought I - * suspect that won't be a problem. - */ - -#include -#include -#include -#include - -#include "qr-bitstream.h" - -#define MAX(a, b) ((a) < (b) ? (b) : (a)) -#define MIN(a, b) ((a) > (b) ? (b) : (a)) - -struct qr_bitstream { - size_t pos; /* bits */ - size_t count; /* bits */ - size_t bufsiz; /* bytes */ - unsigned char * buffer; -}; - -static size_t bits_to_bytes(size_t bits) -{ - return (bits / CHAR_BIT) + (bits % CHAR_BIT != 0); -} - -static int ensure_available(struct qr_bitstream * stream, size_t bits) -{ - size_t need_bits = stream->pos + bits; - size_t newsize; - - if (stream->bufsiz * CHAR_BIT >= need_bits) - return 0; - - newsize = MAX(stream->bufsiz, 100) * CHAR_BIT; - while (newsize < need_bits) - newsize *= 2; - - return qr_bitstream_resize(stream, newsize); -} - -struct qr_bitstream * qr_bitstream_create(void) -{ - struct qr_bitstream * obj; - - obj = malloc(sizeof(*obj)); - - if (obj) { - obj->pos = 0; - obj->count = 0; - obj->bufsiz = 0; - obj->buffer = 0; - } - - return obj; -} - -int qr_bitstream_resize(struct qr_bitstream * stream, size_t bits) -{ - size_t newsize; - void * newbuf; - - newsize = bits_to_bytes(bits); - newbuf = realloc(stream->buffer, newsize); - - if (newbuf) { - stream->bufsiz = newsize; - stream->buffer = newbuf; - } - - return newbuf ? 0 : -1; -} - -void qr_bitstream_destroy(struct qr_bitstream * stream) -{ - free(stream->buffer); - free(stream); -} - -struct qr_bitstream * qr_bitstream_dup(const struct qr_bitstream * src) -{ - struct qr_bitstream * ret; - - ret = qr_bitstream_create(); - if (!ret) - return 0; - - if (qr_bitstream_resize(ret, src->count) != 0) { - free(ret); - return 0; - } - - ret->pos = src->pos; - ret->count = src->count; - memcpy(ret->buffer, src->buffer, src->bufsiz); - - return ret; -} - -void qr_bitstream_seek(struct qr_bitstream * stream, size_t pos) -{ - assert(pos <= stream->count); - stream->pos = pos; -} - -size_t qr_bitstream_tell(const struct qr_bitstream * stream) -{ - return stream->pos; -} - -size_t qr_bitstream_remaining(const struct qr_bitstream * stream) -{ - return stream->count - stream->pos; -} - -size_t qr_bitstream_size(const struct qr_bitstream * stream) -{ - return stream->count; -} - -unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits) -{ - unsigned int result = 0; - unsigned char * byte; - size_t bitnum; - - assert(qr_bitstream_remaining(stream) >= bits); - - byte = stream->buffer + (stream->pos / CHAR_BIT); - bitnum = stream->pos % CHAR_BIT; - - stream->pos += bits; - - while (bits-- > 0) { - int bit = (*byte >> bitnum++) & 0x1; - result = (result << 1) | bit; - if (bitnum == CHAR_BIT) { - bitnum = 0; - ++byte; - } - } - - return result; -} - -void qr_bitstream_unpack(struct qr_bitstream * stream, - unsigned int * result, - size_t count, - size_t bitsize) -{ - assert(qr_bitstream_remaining(stream) >= (count * bitsize)); - - while (count--) - *(result++) = qr_bitstream_read(stream, bitsize); -} - -int qr_bitstream_write(struct qr_bitstream * stream, - unsigned int value, - size_t bits) -{ - unsigned char * byte; - size_t bitnum; - - if (ensure_available(stream, bits) != 0) - return -1; - - byte = stream->buffer + (stream->pos / CHAR_BIT); - bitnum = stream->pos % CHAR_BIT; - - stream->pos += bits; - stream->count = stream->pos; /* truncate */ - - while (bits-- > 0) { - int bit = (value >> bits) & 0x1; - unsigned char mask = 1 << bitnum++; - *byte = (*byte & ~mask) | (bit ? mask : 0); - if (bitnum == CHAR_BIT) { - bitnum = 0; - ++byte; - } - } - - return 0; -} - -int qr_bitstream_pack(struct qr_bitstream * stream, - const unsigned int * values, - size_t count, - size_t bitsize) -{ - if (ensure_available(stream, count * bitsize) != 0) - return -1; - - while (count--) - qr_bitstream_write(stream, *(values++), bitsize); - - return 0; -} - -int qr_bitstream_cat(struct qr_bitstream * dest, const struct qr_bitstream * src) -{ - size_t count = qr_bitstream_size(src); - size_t srcpos; - - if (ensure_available(dest, count) != 0) - return -1; - - srcpos = qr_bitstream_tell(src); - qr_bitstream_seek((struct qr_bitstream *)src, 0); - qr_bitstream_copy(dest, (struct qr_bitstream *)src, count); - qr_bitstream_seek((struct qr_bitstream *)src, srcpos); - - return 0; -} - -int qr_bitstream_copy(struct qr_bitstream * dest, - struct qr_bitstream * src, - size_t count) -{ - if (qr_bitstream_remaining(src) < count) - return -1; - if (ensure_available(dest, count) != 0) - return -1; - - /* uint must be at least 16 bits */ - for (; count >= 16; count -= 16) - qr_bitstream_write( - dest, - qr_bitstream_read((struct qr_bitstream *)src, 16), - 16); - - if (count > 0) - qr_bitstream_write( - dest, - qr_bitstream_read((struct qr_bitstream *)src, count), - count); - - return 0; -} - diff --git a/lpg/libqr/qr-bitstream.h b/lpg/libqr/qr-bitstream.h deleted file mode 100644 index cf20694..0000000 --- a/lpg/libqr/qr-bitstream.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef QR_BITSTREAM_H -#define QR_BITSTREAM_H - -#include - -/** - * Note: when writing / reading multiple bits, the - * _most_ significant bits come first in the stream. - * (That is, the order you would naturally write the - * number in binary) - */ - -struct qr_bitstream; - -struct qr_bitstream * qr_bitstream_create(void); -int qr_bitstream_resize(struct qr_bitstream *, size_t bits); -void qr_bitstream_destroy(struct qr_bitstream *); -struct qr_bitstream * qr_bitstream_dup(const struct qr_bitstream *); - -void qr_bitstream_seek(struct qr_bitstream *, size_t pos); -size_t qr_bitstream_tell(const struct qr_bitstream *); -size_t qr_bitstream_remaining(const struct qr_bitstream *); -size_t qr_bitstream_size(const struct qr_bitstream *); - -unsigned int qr_bitstream_read(struct qr_bitstream *, size_t bits); - -void qr_bitstream_unpack(struct qr_bitstream *, - unsigned int * result, - size_t count, - size_t bitsize); - -int qr_bitstream_write(struct qr_bitstream *, - unsigned int value, - size_t bits); - -int qr_bitstream_pack(struct qr_bitstream *, - const unsigned int * values, - size_t count, - size_t bitsize); - -int qr_bitstream_cat(struct qr_bitstream *, const struct qr_bitstream * src); - -int qr_bitstream_copy(struct qr_bitstream * dest, - struct qr_bitstream * src, - size_t count); - -#endif - diff --git a/lpg/libqr/qr-mask.c b/lpg/libqr/qr-mask.c deleted file mode 100644 index 7ff78a4..0000000 --- a/lpg/libqr/qr-mask.c +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include -#include -#include "qr-mask.h" - -struct qr_bitmap * qr_mask_apply(const struct qr_bitmap * orig, - unsigned int mask) -{ - struct qr_bitmap * bmp; - int i, j; - - if (mask & ~0x7) - return 0; - - bmp = qr_bitmap_clone(orig); - if (!bmp) - return 0; - - /* Slow version for now; we can optimize later */ - - for (i = 0; i < bmp->height; ++i) { - unsigned char * p = bmp->bits + i * bmp->stride; - - for (j = 0; j < bmp->width; ++j) { - int bit = j % CHAR_BIT; - size_t off = j / CHAR_BIT; - int t; - - switch (mask) { - case 0: t = (i + j) % 2; break; - case 1: t = i % 2; break; - case 2: t = j % 3; break; - case 3: t = (i + j) % 3; break; - case 4: t = (i/2 + j/3) % 2; break; - case 5: t = ((i*j) % 2) + ((i*j) % 3); break; - case 6: t = (((i*j) % 2) + ((i*j) % 3)) % 2; break; - case 7: t = (((i*j) % 3) + ((i+j) % 2)) % 2; break; - } - - p[off] ^= (t == 0) << bit; - } - } - - return bmp; -} - diff --git a/lpg/libqr/qr-mask.h b/lpg/libqr/qr-mask.h deleted file mode 100644 index eb254af..0000000 --- a/lpg/libqr/qr-mask.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef QR_MASK_H -#define QR_MASK_H - -#include - -struct qr_bitmap * qr_mask_apply(const struct qr_bitmap * orig, - unsigned int mask); - -#endif - diff --git a/lpg/libqr/qr/bitstream.h b/lpg/libqr/qr/bitstream.h new file mode 100644 index 0000000..cf20694 --- /dev/null +++ b/lpg/libqr/qr/bitstream.h @@ -0,0 +1,48 @@ +#ifndef QR_BITSTREAM_H +#define QR_BITSTREAM_H + +#include + +/** + * Note: when writing / reading multiple bits, the + * _most_ significant bits come first in the stream. + * (That is, the order you would naturally write the + * number in binary) + */ + +struct qr_bitstream; + +struct qr_bitstream * qr_bitstream_create(void); +int qr_bitstream_resize(struct qr_bitstream *, size_t bits); +void qr_bitstream_destroy(struct qr_bitstream *); +struct qr_bitstream * qr_bitstream_dup(const struct qr_bitstream *); + +void qr_bitstream_seek(struct qr_bitstream *, size_t pos); +size_t qr_bitstream_tell(const struct qr_bitstream *); +size_t qr_bitstream_remaining(const struct qr_bitstream *); +size_t qr_bitstream_size(const struct qr_bitstream *); + +unsigned int qr_bitstream_read(struct qr_bitstream *, size_t bits); + +void qr_bitstream_unpack(struct qr_bitstream *, + unsigned int * result, + size_t count, + size_t bitsize); + +int qr_bitstream_write(struct qr_bitstream *, + unsigned int value, + size_t bits); + +int qr_bitstream_pack(struct qr_bitstream *, + const unsigned int * values, + size_t count, + size_t bitsize); + +int qr_bitstream_cat(struct qr_bitstream *, const struct qr_bitstream * src); + +int qr_bitstream_copy(struct qr_bitstream * dest, + struct qr_bitstream * src, + size_t count); + +#endif + diff --git a/lpg/libqr/qr/code.h b/lpg/libqr/qr/code.h index 3c14c1f..ac3c363 100644 --- a/lpg/libqr/qr/code.h +++ b/lpg/libqr/qr/code.h @@ -4,16 +4,26 @@ #include #include "types.h" +struct qr_code { + int version; + struct qr_bitmap * modules; +}; + struct qr_code * qr_code_create(const struct qr_data * data); void qr_code_destroy(struct qr_code *); int qr_code_width(const struct qr_code *); +size_t qr_code_total_capacity(int version); + struct qr_code * qr_code_parse(const void * buffer, size_t line_bits, size_t line_stride, size_t line_count); +struct qr_bitmap * qr_mask_apply(const struct qr_bitmap * orig, + unsigned int mask); + #endif diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h index 34b6968..a3bb309 100644 --- a/lpg/libqr/qr/data.h +++ b/lpg/libqr/qr/data.h @@ -22,6 +22,13 @@ enum qr_ec_level { QR_EC_LEVEL_H = 0x2 }; +struct qr_data { + int version; /* 1 ~ 40 */ + enum qr_ec_level ec; + struct qr_bitstream * bits; + size_t offset; +}; + struct qr_data * qr_create_data(int format, /* 1 ~ 40; 0=auto */ enum qr_ec_level ec, enum qr_data_type type, @@ -30,9 +37,11 @@ struct qr_data * qr_create_data(int format, /* 1 ~ 40; 0=auto */ void qr_free_data(struct qr_data *); -enum qr_data_type qr_get_data_type(const struct qr_data *); +enum qr_data_type qr_data_type(const struct qr_data *); -int qr_get_data_length(const struct qr_data *); +size_t qr_data_length(const struct qr_data *); +size_t qr_data_size_field_length(int version, enum qr_data_type); +size_t qr_data_dpart_length(enum qr_data_type type, size_t nchars); enum qr_data_type qr_parse_data(const struct qr_data * input, char ** output, diff --git a/lpg/libqr/qr/layout.h b/lpg/libqr/qr/layout.h new file mode 100644 index 0000000..49bebf6 --- /dev/null +++ b/lpg/libqr/qr/layout.h @@ -0,0 +1,14 @@ +#ifndef QR_CODE_LAYOUT_H +#define QR_CODE_LAYOUT_H + +struct qr_iterator; + +void qr_layout_init_mask(struct qr_code *); + +struct qr_iterator * qr_layout_begin(struct qr_code * code); +unsigned int qr_layout_read(struct qr_iterator *); +void qr_layout_write(struct qr_iterator *, unsigned int); +void qr_layout_end(struct qr_iterator *); + +#endif + diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 1309596..ad53125 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -1,17 +1,16 @@ +#include #include +#include +#include #include #include #include -#include -#include -#include + #include +#include #include #include -#include "qr-bitstream.h" -#include "code-common.h" - struct config { int version; enum qr_ec_level ec; diff --git a/lpg/libqr/rs-encode.c b/lpg/libqr/rs-encode.c deleted file mode 100644 index a8ecc73..0000000 --- a/lpg/libqr/rs-encode.c +++ /dev/null @@ -1,96 +0,0 @@ -#include -#include -#include "qr-bitstream.h" -#include "rs.h" - -static unsigned int gf_mult(unsigned int a, unsigned int b) -{ - /* Reduce modulo x^8 + x^4 + x^3 + x^2 + 1 - * using the peasant's algorithm - */ - const unsigned int m = 0x11D; - unsigned int x = 0; - int i; - - for (i = 0; i < 8; ++i) { - x ^= (b & 0x1) ? a : 0; - a = (a << 1) ^ ((a & 0x80) ? m : 0); - b >>= 1; - } - - return x & 0xFF; -} - -static unsigned int * make_generator(int k) -{ - unsigned int * g; - unsigned int a; - int i, j; - - g = calloc(k, sizeof(*g)); - if (!g) - return 0; - - g[0] = 1; /* Start with g(x) = 1 */ - a = 1; /* 2^0 = 1 */ - - for (i = 0; i < k; ++i) { - /* Multiply our poly g(x) by (x + 2^i) */ - for (j = k - 1; j > 0; --j) - g[j] = gf_mult(g[j], a) ^ g[j-1]; - g[0] = gf_mult(g[0], a); - - a = gf_mult(a, 2); - } - - return g; -} - -struct qr_bitstream * rs_generate_words(struct qr_bitstream * data, - size_t data_words, - size_t rs_words) -{ - struct qr_bitstream * ec = 0; - unsigned int * b = 0; - unsigned int * g; - size_t n = rs_words; - int i, r; - - assert(qr_bitstream_remaining(data) >= data_words * 8); - - ec = qr_bitstream_create(); - if (!ec) - return 0; - - if (qr_bitstream_resize(ec, n * 8) != 0) - goto fail; - - b = calloc(n, sizeof(*b)); - if (!b) - goto fail; - - g = make_generator(n); - if (!g) - goto fail; - - /* First, prepare the registers (b) with data bits */ - for (i = 0; i < data_words; ++i) { - unsigned int x = b[n-1] ^ qr_bitstream_read(data, 8); - for (r = n-1; r > 0; --r) - b[r] = b[r-1] ^ gf_mult(g[r], x); - b[0] = gf_mult(g[0], x); - } - - /* Read off the registers */ - for (r = 0; r < n; ++r) - qr_bitstream_write(ec, b[(n-1)-r], 8); - - free(g); - free(b); - return ec; -fail: - free(b); - qr_bitstream_destroy(ec); - return 0; -} - diff --git a/lpg/libqr/rs.h b/lpg/libqr/rs.h deleted file mode 100644 index c87d852..0000000 --- a/lpg/libqr/rs.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef RS_H -#define RS_H - -#include "qr-bitstream.h" - -struct qr_bitstream * rs_generate_words(struct qr_bitstream * data, - size_t data_words, - size_t rs_words); - -#endif - -- cgit v1.2.3-70-g09d2 From c02f534047b35e3db4b300264a0abb790e9121af Mon Sep 17 00:00:00 2001 From: Leo Howell Date: Sun, 15 Nov 2009 10:37:45 +0900 Subject: Fix memory leak in qrgen --- lpg/libqr/qrgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index ad53125..b95db0a 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -41,10 +41,10 @@ struct qr_code * create(int version, } code = qr_code_create(data); + qr_free_data(data); if (!code) { perror("Failed to create code"); - qr_free_data(data); exit(2); } -- cgit v1.2.3-70-g09d2 From 27e4017efca48bf053c8e0e6bb083898e7f9833b Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Fri, 15 Jul 2011 15:26:11 +0900 Subject: Add version.h --- lpg/libqr/qr/version.h | 10 ++++++++++ lpg/libqr/qrgen.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 lpg/libqr/qr/version.h (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qr/version.h b/lpg/libqr/qr/version.h new file mode 100644 index 0000000..cd263c0 --- /dev/null +++ b/lpg/libqr/qr/version.h @@ -0,0 +1,10 @@ +#ifndef QR_VERSION_H +#define QR_VERSION_H + +#define QR_VERSION_MAJOR 0 +#define QR_VERSION_MINOR 3 + +#define QR_VERSION "0.3" + +#endif + diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index b95db0a..6098231 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -10,6 +10,7 @@ #include #include #include +#include struct config { int version; @@ -223,7 +224,7 @@ int main(int argc, char ** argv) { if (conf.ansi) output_ansi(code->modules); else - output_pbm(code->modules, "qrgen v0.1"); + output_pbm(code->modules, "libqr v" QR_VERSION); qr_code_destroy(code); -- cgit v1.2.3-70-g09d2 From d4abb878df167875bb66d1e0debe853cb6b88b1b Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Tue, 19 Jul 2011 12:04:15 +0900 Subject: Fix some types --- lpg/libqr/bitmap.c | 6 +++--- lpg/libqr/bitstream.c | 14 +++++++------- lpg/libqr/code-common.c | 2 +- lpg/libqr/code-create.c | 16 +++++++++------- lpg/libqr/code-layout.c | 6 +++--- lpg/libqr/code-parse.c | 4 ++-- lpg/libqr/constants.h | 2 +- lpg/libqr/data-create.c | 2 +- lpg/libqr/galois.c | 2 +- lpg/libqr/qr/bitmap.h | 6 +++--- lpg/libqr/qr/bitstream.h | 10 +++++----- lpg/libqr/qr/parse.h | 2 +- lpg/libqr/qrgen.c | 2 +- 13 files changed, 38 insertions(+), 36 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/bitmap.c b/lpg/libqr/bitmap.c index 759aeca..b9d3763 100644 --- a/lpg/libqr/bitmap.c +++ b/lpg/libqr/bitmap.c @@ -5,7 +5,7 @@ #include -struct qr_bitmap * qr_bitmap_create(int width, int height, int masked) +struct qr_bitmap * qr_bitmap_create(size_t width, size_t height, int masked) { struct qr_bitmap * out; size_t size; @@ -169,9 +169,9 @@ static void render_line_2(unsigned char * out, void qr_bitmap_render(const struct qr_bitmap * bmp, void * buffer, - size_t mod_bits, + int mod_bits, size_t line_stride, - size_t line_repeat, + int line_repeat, unsigned long mark, unsigned long space) { diff --git a/lpg/libqr/bitstream.c b/lpg/libqr/bitstream.c index cf5a9d4..cc8a1ae 100644 --- a/lpg/libqr/bitstream.c +++ b/lpg/libqr/bitstream.c @@ -121,13 +121,13 @@ size_t qr_bitstream_size(const struct qr_bitstream * stream) return stream->count; } -unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits) +unsigned long qr_bitstream_read(struct qr_bitstream * stream, int bits) { - unsigned int result = 0; + unsigned long result = 0; unsigned char * byte; size_t bitnum; - assert(qr_bitstream_remaining(stream) >= bits); + assert(qr_bitstream_remaining(stream) >= (size_t) bits); byte = stream->buffer + (stream->pos / CHAR_BIT); bitnum = stream->pos % CHAR_BIT; @@ -149,7 +149,7 @@ unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits) void qr_bitstream_unpack(struct qr_bitstream * stream, unsigned int * result, size_t count, - size_t bitsize) + int bitsize) { assert(qr_bitstream_remaining(stream) >= (count * bitsize)); @@ -158,8 +158,8 @@ void qr_bitstream_unpack(struct qr_bitstream * stream, } int qr_bitstream_write(struct qr_bitstream * stream, - unsigned int value, - size_t bits) + unsigned long value, + int bits) { unsigned char * byte; size_t bitnum; @@ -189,7 +189,7 @@ int qr_bitstream_write(struct qr_bitstream * stream, int qr_bitstream_pack(struct qr_bitstream * stream, const unsigned int * values, size_t count, - size_t bitsize) + int bitsize) { if (ensure_available(stream, count * bitsize) != 0) return -1; diff --git a/lpg/libqr/code-common.c b/lpg/libqr/code-common.c index 1cb1745..babaf86 100644 --- a/lpg/libqr/code-common.c +++ b/lpg/libqr/code-common.c @@ -76,7 +76,7 @@ void qr_get_rs_block_sizes(int version, void qr_mask_apply(struct qr_bitmap * bmp, int mask) { - int i, j; + size_t i, j; assert((mask & 0x7) == mask); mask &= 0x7; diff --git a/lpg/libqr/code-create.c b/lpg/libqr/code-create.c index cf04eb7..f9d86a7 100644 --- a/lpg/libqr/code-create.c +++ b/lpg/libqr/code-create.c @@ -36,7 +36,7 @@ static void x_dump(struct qr_bitstream * bits) qr_bitstream_seek(bits, 0); n = qr_bitstream_size(bits); for (i = 0; i < n; ++i) { - fprintf(stderr, "%d", qr_bitstream_read(bits, 1)); + fprintf(stderr, "%d", (int) qr_bitstream_read(bits, 1)); if (i % 8 == 7) fputc(' ', stderr); if ((i+1) % (7 * 8) == 0) @@ -173,7 +173,7 @@ static struct qr_bitstream * make_data(int version, const size_t total_data = QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]; int block_count[2], data_length[2], ec_length[2]; int total_blocks; - size_t i, w; + int i, w; struct qr_bitstream * dcopy = 0; struct qr_bitstream * out = 0; struct qr_bitstream ** blocks = 0; @@ -296,7 +296,7 @@ struct qr_code * qr_code_create(const struct qr_data * data) goto fail; qr_bitstream_seek(bits, 0); - while (qr_bitstream_remaining(bits) >= QR_WORD_BITS) + while (qr_bitstream_remaining(bits) >= (size_t) QR_WORD_BITS) qr_layout_write(layout, qr_bitstream_read(bits, QR_WORD_BITS)); qr_layout_end(layout); @@ -370,7 +370,8 @@ static int score_mask(const struct qr_bitmap * bmp) static int score_runs(const struct qr_bitmap * bmp, int base) { /* Runs of 5+n bits -> N[0] + i */ - int x, y, flip; + size_t x, y; + int flip; int score = 0; int count, last; @@ -406,7 +407,7 @@ static int score_runs(const struct qr_bitmap * bmp, int base) static int count_2blocks(const struct qr_bitmap * bmp) { /* Count the number of 2x2 blocks (on or off) */ - int x, y; + size_t x, y; int count = 0; /* Slow and stupid */ @@ -435,7 +436,8 @@ static int count_2blocks(const struct qr_bitmap * bmp) static int count_locators(const struct qr_bitmap * bmp) { /* 1:1:3:1:1 patterns -> N[2] */ - int x, y, flip; + size_t x, y; + int flip; int count = 0; for (flip = 0; flip <= 1; ++flip) { @@ -469,7 +471,7 @@ static int count_locators(const struct qr_bitmap * bmp) static int calc_bw_balance(const struct qr_bitmap * bmp) { /* Calculate the proportion (in percent) of "on" bits */ - int x, y; + size_t x, y; unsigned char bit; long on, total; diff --git a/lpg/libqr/code-layout.c b/lpg/libqr/code-layout.c index 8b4522d..fe8caa7 100644 --- a/lpg/libqr/code-layout.c +++ b/lpg/libqr/code-layout.c @@ -21,11 +21,11 @@ struct qr_iterator { void qr_layout_init_mask(struct qr_code * code) { - int x, y; - int dim = qr_code_width(code); + size_t x, y; + size_t dim = qr_code_width(code); struct qr_bitmap * bmp = code->modules; const int * am_pos = QR_ALIGNMENT_LOCATION[code->version - 1]; - int am_side; + size_t am_side; if (!bmp->mask) qr_bitmap_add_mask(bmp); diff --git a/lpg/libqr/code-parse.c b/lpg/libqr/code-parse.c index d4a2538..3fca4b2 100644 --- a/lpg/libqr/code-parse.c +++ b/lpg/libqr/code-parse.c @@ -111,7 +111,7 @@ static int read_bits(const struct qr_code * code, const size_t total_words = total_bits / QR_WORD_BITS; struct qr_bitstream * raw_bits; struct qr_iterator * layout; - int w; + size_t w; int ret = -1; raw_bits = qr_bitstream_create(); @@ -292,7 +292,7 @@ cleanup: return status; } -int qr_decode_format(unsigned bits, enum qr_ec_level * ec, int * mask) +int qr_decode_format(unsigned long bits, enum qr_ec_level * ec, int * mask) { bits ^= QR_FORMAT_MASK; diff --git a/lpg/libqr/constants.h b/lpg/libqr/constants.h index c13ae5a..b1f7493 100644 --- a/lpg/libqr/constants.h +++ b/lpg/libqr/constants.h @@ -17,7 +17,7 @@ static const unsigned int QR_FORMAT_POLY = 0x537; static const unsigned int QR_VERSION_POLY = 0x1F25; /* A QR-code word is always 8 bits, but CHAR_BIT might not be */ -static const unsigned int QR_WORD_BITS = 8; +static const int QR_WORD_BITS = 8; extern const int QR_ALIGNMENT_LOCATION[40][7]; extern const int QR_DATA_WORD_COUNT[40][4]; diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c index 9d6c384..6437bc1 100644 --- a/lpg/libqr/data-create.c +++ b/lpg/libqr/data-create.c @@ -175,7 +175,7 @@ static int calc_min_version(enum qr_data_type type, for (version = 1; version <= 40; ++version) { if (4 + dbits + qr_data_size_field_length(version, type) - < 8 * QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]) + < 8 * (size_t) QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1]) return version; } diff --git a/lpg/libqr/galois.c b/lpg/libqr/galois.c index f0aadfd..decefb0 100644 --- a/lpg/libqr/galois.c +++ b/lpg/libqr/galois.c @@ -83,7 +83,7 @@ struct qr_bitstream * rs_generate_words(struct qr_bitstream * data, unsigned int * b = 0; unsigned int * g; size_t n = rs_words; - int i, r; + size_t i, r; assert(qr_bitstream_remaining(data) >= data_words * 8); diff --git a/lpg/libqr/qr/bitmap.h b/lpg/libqr/qr/bitmap.h index 36c56b3..d4af471 100644 --- a/lpg/libqr/qr/bitmap.h +++ b/lpg/libqr/qr/bitmap.h @@ -8,7 +8,7 @@ struct qr_bitmap { size_t width, height; }; -struct qr_bitmap * qr_bitmap_create(int width, int height, int masked); +struct qr_bitmap * qr_bitmap_create(size_t width, size_t height, int masked); void qr_bitmap_destroy(struct qr_bitmap *); int qr_bitmap_add_mask(struct qr_bitmap *); @@ -19,9 +19,9 @@ void qr_bitmap_merge(struct qr_bitmap * dest, const struct qr_bitmap * src); void qr_bitmap_render(const struct qr_bitmap * bmp, void * buffer, - size_t mod_bits, + int mod_bits, size_t line_stride, - size_t line_repeat, + int line_repeat, unsigned long mark, unsigned long space); diff --git a/lpg/libqr/qr/bitstream.h b/lpg/libqr/qr/bitstream.h index 5ca6b41..9bd8261 100644 --- a/lpg/libqr/qr/bitstream.h +++ b/lpg/libqr/qr/bitstream.h @@ -22,21 +22,21 @@ size_t qr_bitstream_tell(const struct qr_bitstream *); size_t qr_bitstream_remaining(const struct qr_bitstream *); size_t qr_bitstream_size(const struct qr_bitstream *); -unsigned int qr_bitstream_read(struct qr_bitstream *, size_t bits); +unsigned long qr_bitstream_read(struct qr_bitstream *, int bits); void qr_bitstream_unpack(struct qr_bitstream *, unsigned int * result, size_t count, - size_t bitsize); + int bitsize); int qr_bitstream_write(struct qr_bitstream *, - unsigned int value, - size_t bits); + unsigned long value, + int bits); int qr_bitstream_pack(struct qr_bitstream *, const unsigned int * values, size_t count, - size_t bitsize); + int bitsize); int qr_bitstream_cat(struct qr_bitstream *, const struct qr_bitstream * src); diff --git a/lpg/libqr/qr/parse.h b/lpg/libqr/qr/parse.h index d7b8c4e..07a0424 100644 --- a/lpg/libqr/qr/parse.h +++ b/lpg/libqr/qr/parse.h @@ -9,7 +9,7 @@ int qr_code_parse(const void * buffer, size_t line_count, struct qr_data ** data); -int qr_decode_format(unsigned bits, enum qr_ec_level * ec, int * mask); +int qr_decode_format(unsigned long bits, enum qr_ec_level * ec, int * mask); int qr_decode_version(unsigned long bits, int * version); #endif diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 6098231..3007011 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -100,7 +100,7 @@ void output_ansi(const struct qr_bitmap * bmp) }; unsigned char * line; - int x, y; + size_t x, y; line = bmp->bits; -- cgit v1.2.3-70-g09d2 From 1ea62d837531c4d5795381da5a2566606e03ac4b Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Tue, 19 Jul 2011 12:06:08 +0900 Subject: Consistent function names --- lpg/libqr/data-common.c | 2 +- lpg/libqr/data-create.c | 2 +- lpg/libqr/qr/data.h | 4 ++-- lpg/libqr/qrgen.c | 4 ++-- lpg/libqr/qrparse.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/data-common.c b/lpg/libqr/data-common.c index 8a05f4a..af3a766 100644 --- a/lpg/libqr/data-common.c +++ b/lpg/libqr/data-common.c @@ -3,7 +3,7 @@ #include #include -void qr_free_data(struct qr_data * data) +void qr_data_destroy(struct qr_data * data) { qr_bitstream_destroy(data->bits); free(data); diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c index 6437bc1..8ab127d 100644 --- a/lpg/libqr/data-create.c +++ b/lpg/libqr/data-create.c @@ -182,7 +182,7 @@ static int calc_min_version(enum qr_data_type type, return -1; } -struct qr_data * qr_create_data(int version, +struct qr_data * qr_data_create(int version, enum qr_ec_level ec, enum qr_data_type type, const char * input, diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h index 3cc665a..f2b4b45 100644 --- a/lpg/libqr/qr/data.h +++ b/lpg/libqr/qr/data.h @@ -11,13 +11,13 @@ struct qr_data { size_t offset; }; -struct qr_data * qr_create_data(int format, /* 1 ~ 40; 0=auto */ +struct qr_data * qr_data_create(int format, /* 1 ~ 40; 0=auto */ enum qr_ec_level ec, enum qr_data_type type, const char * input, size_t length); -void qr_free_data(struct qr_data *); +void qr_data_destroy(struct qr_data *); enum qr_data_type qr_data_type(const struct qr_data *); diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 3007011..d59954d 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -31,7 +31,7 @@ struct qr_code * create(int version, len = strlen(input); - data = qr_create_data(version, ec, dtype, input, len); + data = qr_data_create(version, ec, dtype, input, len); if (!data) { /* BUG: this could also indicate OOM or @@ -42,7 +42,7 @@ struct qr_code * create(int version, } code = qr_code_create(data); - qr_free_data(data); + qr_data_destroy(data); if (!code) { perror("Failed to create code"); diff --git a/lpg/libqr/qrparse.c b/lpg/libqr/qrparse.c index 4a9312f..013066b 100644 --- a/lpg/libqr/qrparse.c +++ b/lpg/libqr/qrparse.c @@ -51,7 +51,7 @@ int main(int argc, char ** argv) } fprintf(stderr, "Data type: %s; %lu bytes\nContent: %s\n", type_str, data_len, data_str); free(data_str); - qr_free_data(data); + qr_data_destroy(data); } return 0; -- cgit v1.2.3-70-g09d2 From dc2db0639bec07ed06b90f5232aa437548ef760c Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Mon, 14 Jan 2013 21:11:28 +0900 Subject: qrgen: read data from file --- lpg/libqr/qrgen.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 7 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index d59954d..77fdeb2 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -17,19 +17,18 @@ struct config { enum qr_ec_level ec; enum qr_data_type dtype; int ansi; + const char * file; const char * input; }; struct qr_code * create(int version, enum qr_ec_level ec, enum qr_data_type dtype, - const char * input) + const char * input, + size_t len) { struct qr_data * data; struct qr_code * code; - size_t len; - - len = strlen(input); data = qr_data_create(version, ec, dtype, input, len); @@ -124,6 +123,7 @@ void show_help() { fprintf(stderr, "Usage:\n\t%s [options] \n\n" "\t-h Display this help message\n" + "\t-f File containing data to encode (- for stdin)\n" "\t-v Specify QR version (size) 1 <= n <= 40\n" "\t-e Specify EC type: L, M, Q, H\n" "\t-a Output as ANSI graphics (default)\n" @@ -137,6 +137,7 @@ void set_default_config(struct config * conf) conf->ec = QR_EC_LEVEL_M; conf->dtype = QR_DATA_8BIT; conf->ansi = 1; + conf->file = NULL; conf->input = NULL; } @@ -145,7 +146,7 @@ void parse_options(int argc, char ** argv, struct config * conf) int c; for (;;) { - c = getopt(argc, argv, ":hv:e:t:ap"); + c = getopt(argc, argv, ":hf:v:e:t:ap"); if (c == -1) /* no more options */ break; @@ -155,6 +156,9 @@ void parse_options(int argc, char ** argv, struct config * conf) show_help(); exit(0); break; + case 'f': /* file */ + conf->file = optarg; + break; case 'v': /* version */ conf->version = atoi(optarg); if (conf->version < 1 || conf->version > 40) { @@ -202,24 +206,74 @@ void parse_options(int argc, char ** argv, struct config * conf) if (optind < argc) conf->input = argv[optind++]; - if (!conf->input) { + if (!conf->file && !conf->input) { fprintf(stderr, "No data (try -h for help)\n"); exit(1); } } +void slurp_file(const char * path, char ** data, size_t * len) +{ + const size_t chunk_size = 65536; + FILE * file; + char * tmpbuf; + size_t count; + + if (strcmp(path, "-") == 0) + file = stdin; + else + file = fopen(path, "rb"); + + if (!file) { + fprintf(stderr, "Failed to open %s\n", path); + exit(2); + } + + *data = NULL; + *len = 0; + + do { + tmpbuf = realloc(*data, *len + chunk_size); + if (!tmpbuf) { + perror("realloc"); + exit(2); + } + *data = tmpbuf; + count = fread(*data + *len, 1, chunk_size, file); + if (count == 0 && !feof(file)) { + perror("fread"); + exit(2); + } + *len += count; + } while (*len == chunk_size); + + fclose(file); +} + int main(int argc, char ** argv) { struct config conf; struct qr_code * code; + char * file_data; + size_t len; set_default_config(&conf); parse_options(argc, argv, &conf); + if (conf.file) + slurp_file(conf.file, &file_data, &len); + else + len = strlen(conf.input); + + code = create(conf.version, conf.ec, conf.dtype, - conf.input); + conf.file ? file_data : conf.input, + len); + + if (conf.file) + free(file_data); if (conf.ansi) output_ansi(code->modules); -- cgit v1.2.3-70-g09d2 From 082fc1b97f2297fee6b2bba222c0c2e87f931493 Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Mon, 14 Jan 2013 21:51:34 +0900 Subject: qrgen: output to file --- lpg/libqr/qrgen.c | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 77fdeb2..80e8ac2 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -18,6 +18,7 @@ struct config { enum qr_data_type dtype; int ansi; const char * file; + const char * outfile; const char * input; }; @@ -51,17 +52,17 @@ struct qr_code * create(int version, return code; } -void output_pbm(const struct qr_bitmap * bmp, const char * comment) +void output_pbm(FILE * file, const struct qr_bitmap * bmp, const char * comment) { unsigned char * row; int x, y; - puts("P1"); + fputs("P1\n", file); if (comment) - printf("# %s\n", comment); + fprintf(file, "# %s\n", comment); - printf("%u %u\n", + fprintf(file, "%u %u\n", (unsigned)bmp->width + 8, (unsigned)bmp->height + 8); @@ -71,27 +72,27 @@ void output_pbm(const struct qr_bitmap * bmp, const char * comment) if (y < 0 || y >= (int)bmp->height) { for (x = 0; x < (int)bmp->width + 8; ++x) - printf("0 "); - putchar('\n'); + fputs("0 ", file); + fputc('\n', file); continue; } - printf("0 0 0 0 "); + fputs("0 0 0 0 ", file); for (x = 0; x < (int)bmp->width; ++x) { int mask = 1 << x % CHAR_BIT; int byte = row[x / CHAR_BIT]; - printf("%c ", (byte & mask) ? '1' : '0'); + fprintf(file, "%c ", (byte & mask) ? '1' : '0'); } - puts("0 0 0 0"); + fputs("0 0 0 0\n", file); row += bmp->stride; } } -void output_ansi(const struct qr_bitmap * bmp) +void output_ansi(FILE * file, const struct qr_bitmap * bmp) { const char * out[2] = { " ", @@ -110,10 +111,10 @@ void output_ansi(const struct qr_bitmap * bmp) int mask = 1 << (x % CHAR_BIT); int byte = line[x / CHAR_BIT]; - printf("%s", out[!!(byte & mask)]); + fprintf(file, "%s", out[!!(byte & mask)]); } - putchar('\n'); + fputc('\n', file); line += bmp->stride; } @@ -127,7 +128,8 @@ void show_help() { "\t-v Specify QR version (size) 1 <= n <= 40\n" "\t-e Specify EC type: L, M, Q, H\n" "\t-a Output as ANSI graphics (default)\n" - "\t-p Output as PBM\n\n", + "\t-p Output as PBM\n" + "\t-o File to write (- for stdout)\n\n", "qrgen"); } @@ -138,6 +140,7 @@ void set_default_config(struct config * conf) conf->dtype = QR_DATA_8BIT; conf->ansi = 1; conf->file = NULL; + conf->outfile = NULL; conf->input = NULL; } @@ -146,7 +149,7 @@ void parse_options(int argc, char ** argv, struct config * conf) int c; for (;;) { - c = getopt(argc, argv, ":hf:v:e:t:ap"); + c = getopt(argc, argv, ":hf:v:e:t:apo:"); if (c == -1) /* no more options */ break; @@ -186,6 +189,8 @@ void parse_options(int argc, char ** argv, struct config * conf) conf->ansi = 1; break; case 'p': /* pnm */ conf->ansi = 0; break; + case 'o': /* output file */ + conf->outfile = optarg; break; case ':': fprintf(stderr, "Argument \"%s\" missing parameter\n", @@ -256,6 +261,7 @@ int main(int argc, char ** argv) { struct qr_code * code; char * file_data; size_t len; + FILE * outfile; set_default_config(&conf); parse_options(argc, argv, &conf); @@ -265,6 +271,19 @@ int main(int argc, char ** argv) { else len = strlen(conf.input); + if (!conf.outfile) { + conf.outfile = conf.ansi ? "-" : "qr.pbm"; + } + + if (strcmp(conf.outfile, "-") == 0) { + outfile = stdout; + } else { + outfile = fopen(conf.outfile, "wb"); + if (!outfile) { + perror("fopen"); + exit(2); + } + } code = create(conf.version, conf.ec, @@ -276,10 +295,11 @@ int main(int argc, char ** argv) { free(file_data); if (conf.ansi) - output_ansi(code->modules); + output_ansi(outfile, code->modules); else - output_pbm(code->modules, "libqr v" QR_VERSION); + output_pbm(outfile, code->modules, "libqr v" QR_VERSION); + fclose(outfile); qr_code_destroy(code); return 0; -- cgit v1.2.3-70-g09d2 From 7cfac56b2eaec43e507bf31313d5a16ac8133fba Mon Sep 17 00:00:00 2001 From: Leo Uino Date: Mon, 14 Jan 2013 23:01:58 +0900 Subject: qrgen: output to PNG --- lpg/libqr/Makefile | 2 +- lpg/libqr/qrgen.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 104 insertions(+), 9 deletions(-) (limited to 'lpg/libqr/qrgen.c') diff --git a/lpg/libqr/Makefile b/lpg/libqr/Makefile index fa6cf04..154bcbf 100644 --- a/lpg/libqr/Makefile +++ b/lpg/libqr/Makefile @@ -21,7 +21,7 @@ $(OBJECTS) : $(wildcard *.h qr/*.h) libqr : libqr.a($(OBJECTS)) qrgen : libqr qrgen.c - $(CC) $(CFLAGS) -o qrgen qrgen.c libqr.a + $(CC) $(CFLAGS) -o qrgen qrgen.c libqr.a $(shell pkg-config libpng --cflags --libs) qrparse : libqr qrparse.c $(CC) $(CFLAGS) -o qrparse qrparse.c libqr.a diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c index 80e8ac2..cf518e5 100644 --- a/lpg/libqr/qrgen.c +++ b/lpg/libqr/qrgen.c @@ -2,6 +2,8 @@ #include #include #include +#include +#include #include #include #include @@ -16,7 +18,11 @@ struct config { int version; enum qr_ec_level ec; enum qr_data_type dtype; - int ansi; + enum { + FORMAT_ANSI, + FORMAT_PBM, + FORMAT_PNG + } format; const char * file; const char * outfile; const char * input; @@ -120,6 +126,78 @@ void output_ansi(FILE * file, const struct qr_bitmap * bmp) } } +void output_png(FILE * file, const struct qr_bitmap * bmp, const char * comment) +{ + const int px_size = 4; + png_structp png_ptr; + png_infop info_ptr; + png_text text; + int x, y, p; + unsigned char * row; + + png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png_ptr) + goto err; + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + goto err; + + if (setjmp(png_jmpbuf(png_ptr))) + goto err; + + png_init_io(png_ptr, file); + png_set_IHDR(png_ptr, info_ptr, + (bmp->width + 8) * px_size, + (bmp->height + 8) * px_size, + 1, + PNG_COLOR_TYPE_GRAY, + PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); + + text.compression = PNG_TEXT_COMPRESSION_NONE; + text.key = "Software"; + text.text = (char *) comment; + text.text_length = strlen(comment); + png_set_text(png_ptr, info_ptr, &text, 1); + + png_write_info(png_ptr, info_ptr); + png_set_packing(png_ptr); + + row = malloc((bmp->width + 8) * px_size); + memset(row, 1, (bmp->width + 8) * px_size); + for (y = 0; y < 4; ++y) + for (p = 0; p < px_size; ++p) + png_write_row(png_ptr, row); + + for (y = 0; y < bmp->height; ++y) { + const unsigned char * bmp_row = bmp->bits + y * bmp->stride; + unsigned char * out = row + 4 * px_size; + for (x = 0; x < bmp->width; ++x) { + int px = bmp_row[x / CHAR_BIT] & (1 << (x % CHAR_BIT)); + for (p = 0; p < px_size; ++p) + *out++ = !px; + } + for (p = 0; p < px_size; ++p) + png_write_row(png_ptr, row); + } + + memset(row, 1, (bmp->width + 8) * px_size); + for (y = 0; y < 4; ++y) + for (p = 0; p < px_size; ++p) + png_write_row(png_ptr, row); + + free(row); + png_write_end(png_ptr, info_ptr); + png_destroy_write_struct(&png_ptr, NULL); + return; + +err: + fprintf(stderr, "error writing PNG\n"); + exit(2); +} + void show_help() { fprintf(stderr, "Usage:\n\t%s [options] \n\n" @@ -129,6 +207,7 @@ void show_help() { "\t-e Specify EC type: L, M, Q, H\n" "\t-a Output as ANSI graphics (default)\n" "\t-p Output as PBM\n" + "\t-g Output as PNG\n" "\t-o File to write (- for stdout)\n\n", "qrgen"); } @@ -138,7 +217,7 @@ void set_default_config(struct config * conf) conf->version = 0; conf->ec = QR_EC_LEVEL_M; conf->dtype = QR_DATA_8BIT; - conf->ansi = 1; + conf->format = FORMAT_ANSI; conf->file = NULL; conf->outfile = NULL; conf->input = NULL; @@ -149,7 +228,7 @@ void parse_options(int argc, char ** argv, struct config * conf) int c; for (;;) { - c = getopt(argc, argv, ":hf:v:e:t:apo:"); + c = getopt(argc, argv, ":hf:v:e:t:apgo:"); if (c == -1) /* no more options */ break; @@ -186,9 +265,11 @@ void parse_options(int argc, char ** argv, struct config * conf) fprintf(stderr, "XXX: ignored \"type\"\n"); break; case 'a': /* ansi */ - conf->ansi = 1; break; + conf->format = FORMAT_ANSI; break; case 'p': /* pnm */ - conf->ansi = 0; break; + conf->format = FORMAT_PBM; break; + case 'g': /* png */ + conf->format = FORMAT_PNG; break; case 'o': /* output file */ conf->outfile = optarg; break; case ':': @@ -272,7 +353,14 @@ int main(int argc, char ** argv) { len = strlen(conf.input); if (!conf.outfile) { - conf.outfile = conf.ansi ? "-" : "qr.pbm"; + switch (conf.format) { + case FORMAT_ANSI: + conf.outfile = "-"; break; + case FORMAT_PBM: + conf.outfile = "qr.pbm"; break; + case FORMAT_PNG: + conf.outfile = "qr.png"; break; + } } if (strcmp(conf.outfile, "-") == 0) { @@ -294,10 +382,17 @@ int main(int argc, char ** argv) { if (conf.file) free(file_data); - if (conf.ansi) + switch (conf.format) { + case FORMAT_ANSI: output_ansi(outfile, code->modules); - else + break; + case FORMAT_PBM: output_pbm(outfile, code->modules, "libqr v" QR_VERSION); + break; + case FORMAT_PNG: + output_png(outfile, code->modules, "libqr v" QR_VERSION); + break; + } fclose(outfile); qr_code_destroy(code); -- cgit v1.2.3-70-g09d2