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

Updated form master

Browse Source
This commit is contained in:
tgotic
2011-01-17 19:46:08 +01:00
parent 5ded29ebf4
commit a5732c81c6
1 changed files with 89 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

405
backend/qr.c
View File

@@ -133,7 +133,7 @@ int estimate_binary_length(char mode[], int length, int gs1)
case 'B': count += 8; break; case 'B': count += 8; break;
case 'A': case 'A':
a_count++; a_count++;
if((a_count % 2) == 0) { if((a_count & 1) == 0) {
count += 5; // 11 in total count += 5; // 11 in total
a_count = 0; a_count = 0;
} }
@@ -146,10 +146,10 @@ int estimate_binary_length(char mode[], int length, int gs1)
count += 3; // 10 in total count += 3; // 10 in total
n_count = 0; n_count = 0;
} }
else if ((n_count % 2) == 0) else if ((n_count & 1) == 0)
count += 3; // 7 in total count += 3; // 7 in total
else else
count += 4; count += 4;
break; break;
} }
} }
@@ -157,11 +157,18 @@ int estimate_binary_length(char mode[], int length, int gs1)
return count; return count;
} }
static inline void qr_bscan(char *binary, int data, int h)
{
for (; h; h>>=1) {
concat(binary, data & h ? "1" : "0");
}
}
void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1, int est_binlen) void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1, int est_binlen)
{ {
/* Convert input data to a binary stream and add padding */ /* Convert input data to a binary stream and add padding */
int position = 0, debug = 0; int position = 0, debug = 0;
int short_data_block_length, i, scheme; int short_data_block_length, i, scheme = 1;
char data_block, padbits; char data_block, padbits;
int current_binlen, current_bytes; int current_binlen, current_bytes;
int toggle, percent; int toggle, percent;
@@ -179,11 +186,9 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
if(version <= 9) { if(version <= 9) {
scheme = 1; scheme = 1;
} } else if((version >= 10) && (version <= 26)) {
if((version >= 10) && (version <= 26)) {
scheme = 2; scheme = 2;
} } else if(version >= 27) {
if(version >= 27) {
scheme = 3; scheme = 3;
} }
@@ -210,24 +215,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
concat(binary, "1000"); concat(binary, "1000");
/* Character count indicator */ /* Character count indicator */
switch(scheme) { qr_bscan(binary, short_data_block_length, 0x20 << (scheme*2)); /* scheme = 1..3 */
case 3:
if(short_data_block_length & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
case 2:
if(short_data_block_length & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(short_data_block_length & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("Kanji block (length %d)\n\t", short_data_block_length); } if(debug) { printf("Kanji block (length %d)\n\t", short_data_block_length); }
@@ -241,19 +229,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
lsb = (jis & 0xff); lsb = (jis & 0xff);
prod = (msb * 0xc0) + lsb; prod = (msb * 0xc0) + lsb;
if(prod & 0x1000) { concat(binary, "1"); } else { concat(binary, "0"); } qr_bscan(binary, prod, 0x1000);
if(prod & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
if(debug) { printf("0x%4X ", prod); } if(debug) { printf("0x%4X ", prod); }
} }
@@ -267,28 +243,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
concat(binary, "0100"); concat(binary, "0100");
/* Character count indicator */ /* Character count indicator */
switch (scheme) { qr_bscan(binary, short_data_block_length, scheme > 1 ? 0x8000 : 0x80); /* scheme = 1..3 */
case 3:
case 2:
if(short_data_block_length & 0x8000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x4000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x2000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x1000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(short_data_block_length & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("Byte block (length %d)\n\t", short_data_block_length); } if(debug) { printf("Byte block (length %d)\n\t", short_data_block_length); }
@@ -300,16 +255,9 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
byte = 0x1d; /* FNC1 */ byte = 0x1d; /* FNC1 */
} }
if(byte & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); } qr_bscan(binary, byte, 0x80);
if(byte & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
if(debug) { printf("0x%4X ", byte); } if(debug) { printf("0x%2X(%d) ", byte, byte); }
} }
if(debug) { printf("\n"); } if(debug) { printf("\n"); }
@@ -321,25 +269,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
concat(binary, "0010"); concat(binary, "0010");
/* Character count indicator */ /* Character count indicator */
switch (scheme) { qr_bscan(binary, short_data_block_length, 0x40 << (2 * scheme)); /* scheme = 1..3 */
case 3:
if(short_data_block_length & 0x1000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
case 2:
if(short_data_block_length & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(short_data_block_length & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("Alpha block (length %d)\n\t", short_data_block_length); } if(debug) { printf("Alpha block (length %d)\n\t", short_data_block_length); }
@@ -410,22 +340,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
} }
} }
switch(count) { qr_bscan(binary, prod, count == 2 ? 0x400 : 0x20); /* count = 1..2 */
case 2:
if(prod & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("0x%4X ", prod); } if(debug) { printf("0x%4X ", prod); }
}; };
@@ -439,26 +354,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
concat(binary, "0001"); concat(binary, "0001");
/* Character count indicator */ /* Character count indicator */
switch (scheme) { qr_bscan(binary, short_data_block_length, 0x80 << (2 * scheme)); /* scheme = 1..3 */
case 3:
if(short_data_block_length & 0x2000) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x1000) { concat(binary, "1"); } else { concat(binary, "0"); }
case 2:
if(short_data_block_length & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(short_data_block_length & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(short_data_block_length & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("Number block (length %d)\n\t", short_data_block_length); } if(debug) { printf("Number block (length %d)\n\t", short_data_block_length); }
@@ -476,30 +372,15 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
second = posn(NEON, (char) jisdata[position + i + 1]); second = posn(NEON, (char) jisdata[position + i + 1]);
count = 2; count = 2;
prod = (prod * 10) + second; prod = (prod * 10) + second;
if(mode[position + i + 2] == 'N') {
third = posn(NEON, (char) jisdata[position + i + 2]);
count = 3;
prod = (prod * 10) + third;
}
} }
if(mode[position + i + 2] == 'N') { qr_bscan(binary, prod, 1 << (3 * count)); /* count = 1..3 */
third = posn(NEON, (char) jisdata[position + i + 2]);
count = 3;
prod = (prod * 10) + third;
}
switch(count) {
case 3:
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
case 2:
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("0x%4X (%d)", prod, prod); } if(debug) { printf("0x%4X (%d)", prod, prod); }
@@ -512,7 +393,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
} }
position += short_data_block_length; position += short_data_block_length;
} while (position < length - 1) ; } while (position < length) ;
/* Terminator */ /* Terminator */
concat(binary, "0000"); concat(binary, "0000");
@@ -553,6 +434,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
} }
if(debug) { if(debug) {
printf("Resulting codewords:\n\t");
for(i = 0; i < target_binlen; i++) { for(i = 0; i < target_binlen; i++) {
printf("0x%2X ", datastream[i]); printf("0x%2X ", datastream[i]);
} }
@@ -996,14 +878,14 @@ int apply_bitmask(unsigned char *grid, int size)
mask[(y * size) + x] = 0x00; mask[(y * size) + x] = 0x00;
if (!(grid[(y * size) + x] & 0xf0)) { if (!(grid[(y * size) + x] & 0xf0)) {
if(((y + x) % 2) == 0) { mask[(y * size) + x] += 0x01; } if(((y + x) & 1) == 0) { mask[(y * size) + x] += 0x01; }
if((y % 2) == 0) { mask[(y * size) + x] += 0x02; } if((y & 1) == 0) { mask[(y * size) + x] += 0x02; }
if((x % 3) == 0) { mask[(y * size) + x] += 0x04; } if((x % 3) == 0) { mask[(y * size) + x] += 0x04; }
if(((y + x) % 3) == 0) { mask[(y * size) + x] += 0x08; } if(((y + x) % 3) == 0) { mask[(y * size) + x] += 0x08; }
if((((y / 2) + (x / 3)) % 2) == 0) { mask[(y * size) + x] += 0x10; } if((((y / 2) + (x / 3)) & 1) == 0) { mask[(y * size) + x] += 0x10; }
if((((y * x) % 2) + ((y * x) % 3)) == 0) { mask[(y * size) + x] += 0x20; } if((((y * x) & 1) + ((y * x) % 3)) == 0) { mask[(y * size) + x] += 0x20; }
if(((((y * x) % 2) + ((y * x) % 3)) % 2) == 0) { mask[(y * size) + x] += 0x40; } if(((((y * x) & 1) + ((y * x) % 3)) & 1) == 0) { mask[(y * size) + x] += 0x40; }
if(((((y + x) % 2) + ((y * x) % 3)) % 2) == 0) { mask[(y * size) + x] += 0x80; } if(((((y + x) & 1) + ((y * x) % 3)) & 1) == 0) { mask[(y * size) + x] += 0x80; }
} }
} }
} }
@@ -1102,12 +984,12 @@ void add_version_info(unsigned char *grid, int size, int version)
long int version_data = qr_annex_d[version - 7]; long int version_data = qr_annex_d[version - 7];
for(i = 0; i < 6; i++) { for(i = 0; i < 6; i++) {
grid[((size - 11) * size) + i] += (version_data >> (17 - (i * 3))) & 0x01; grid[((size - 11) * size) + i] += (version_data >> (i * 3)) & 0x01;
grid[((size - 10) * size) + i] += (version_data >> (16 - (i * 3))) & 0x01; grid[((size - 10) * size) + i] += (version_data >> ((i * 3) + 1)) & 0x01;
grid[((size - 9) * size) + i] += (version_data >> (15 - (i * 3))) & 0x01; grid[((size - 9) * size) + i] += (version_data >> ((i * 3) + 2)) & 0x01;
grid[(i * size) + (size - 11)] += (version_data >> (17 - (i * 3))) & 0x01; grid[(i * size) + (size - 11)] += (version_data >> (i * 3)) & 0x01;
grid[(i * size) + (size - 10)] += (version_data >> (16 - (i * 3))) & 0x01; grid[(i * size) + (size - 10)] += (version_data >> ((i * 3) + 1)) & 0x01;
grid[(i * size) + (size - 9)] += (version_data >> (15 - (i * 3))) & 0x01; grid[(i * size) + (size - 9)] += (version_data >> ((i * 3) + 2)) & 0x01;
} }
} }
@@ -1127,11 +1009,7 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[], int length)
char* mode = (char *)_alloca(length + 1); char* mode = (char *)_alloca(length + 1);
#endif #endif
if(symbol->input_mode == GS1_MODE) { gs1 = (symbol->input_mode == GS1_MODE);
gs1 = 1;
} else {
gs1 = 0;
}
switch(symbol->input_mode) { switch(symbol->input_mode) {
case DATA_MODE: case DATA_MODE:
@@ -1158,7 +1036,7 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[], int length)
} while ((j < 6843) && (glyph == 0)); } while ((j < 6843) && (glyph == 0));
if(glyph == 0) { if(glyph == 0) {
strcpy(symbol->errtxt, "Invalid character in input data"); strcpy(symbol->errtxt, "Invalid character in input data");
return ERROR_INVALID_DATA; return ZERROR_INVALID_DATA;
} }
jisdata[i] = glyph; jisdata[i] = glyph;
} }
@@ -1182,7 +1060,7 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[], int length)
if(est_binlen > (8 * max_cw)) { if(est_binlen > (8 * max_cw)) {
strcpy(symbol->errtxt, "Input too long for selected error correction level"); strcpy(symbol->errtxt, "Input too long for selected error correction level");
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
autosize = 40; autosize = 40;
@@ -1302,7 +1180,7 @@ int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length,
do { do {
if(strlen(binary) > 128) { if(strlen(binary) > 128) {
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
data_block = mode[position]; data_block = mode[position];
@@ -1335,24 +1213,12 @@ int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length,
lsb = (jis & 0xff); lsb = (jis & 0xff);
prod = (msb * 0xc0) + lsb; prod = (msb * 0xc0) + lsb;
if(prod & 0x1000) { concat(binary, "1"); } else { concat(binary, "0"); } qr_bscan(binary, prod, 0x1000);
if(prod & 0x800) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
if(debug) { printf("0x%4X ", prod); } if(debug) { printf("0x%4X ", prod); }
if(strlen(binary) > 128) { if(strlen(binary) > 128) {
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
} }
@@ -1376,19 +1242,12 @@ int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length,
for(i = 0; i < short_data_block_length; i++) { for(i = 0; i < short_data_block_length; i++) {
int byte = jisdata[position + i]; int byte = jisdata[position + i];
if(byte & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); } qr_bscan(binary, byte, 0x80);
if(byte & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(byte & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
if(debug) { printf("0x%4X ", byte); } if(debug) { printf("0x%4X ", byte); }
if(strlen(binary) > 128) { if(strlen(binary) > 128) {
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
} }
@@ -1424,27 +1283,12 @@ int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length,
prod = (first * 45) + second; prod = (first * 45) + second;
} }
switch(count) { qr_bscan(binary, prod, 1 << (5 * count)); /* count = 1..2 */
case 2:
if(prod & 0x400) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("0x%4X ", prod); } if(debug) { printf("0x%4X ", prod); }
if(strlen(binary) > 128) { if(strlen(binary) > 128) {
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
i += 2; i += 2;
@@ -1487,27 +1331,12 @@ int micro_qr_intermediate(char binary[], int jisdata[], char mode[], int length,
prod = (prod * 10) + third; prod = (prod * 10) + third;
} }
switch(count) { qr_bscan(binary, prod, 1 << (3 * count)); /* count = 1..3 */
case 3:
if(prod & 0x200) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x100) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x80) { concat(binary, "1"); } else { concat(binary, "0"); }
case 2:
if(prod & 0x40) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x20) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x10) { concat(binary, "1"); } else { concat(binary, "0"); }
case 1:
if(prod & 0x08) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x04) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x02) { concat(binary, "1"); } else { concat(binary, "0"); }
if(prod & 0x01) { concat(binary, "1"); } else { concat(binary, "0"); }
break;
}
if(debug) { printf("0x%4X (%d)", prod, prod); } if(debug) { printf("0x%4X (%d)", prod, prod); }
if(strlen(binary) > 128) { if(strlen(binary) > 128) {
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
i += 3; i += 3;
@@ -1592,18 +1421,7 @@ void microqr_expand_binary(char binary_stream[], char full_stream[], int version
} }
/* Character count indicator */ /* Character count indicator */
switch(version) { qr_bscan(full_stream, binary_stream[i + 1], 4 << version); /* version = 0..3 */
case 3:
if(binary_stream[i + 1] & 0x20) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 2:
if(binary_stream[i + 1] & 0x10) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 1:
if(binary_stream[i + 1] & 0x08) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 0:
if(binary_stream[i + 1] & 0x04) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x02) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x01) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
}
i += 2; i += 2;
break; break;
@@ -1617,16 +1435,7 @@ void microqr_expand_binary(char binary_stream[], char full_stream[], int version
} }
/* Character count indicator */ /* Character count indicator */
switch(version) { qr_bscan(full_stream, binary_stream[i + 1], 2 << version); /* version = 1..3 */
case 3:
if(binary_stream[i + 1] & 0x10) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 2:
if(binary_stream[i + 1] & 0x08) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 1:
if(binary_stream[i + 1] & 0x04) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x02) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x01) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
}
i += 2; i += 2;
break; break;
@@ -1639,15 +1448,7 @@ void microqr_expand_binary(char binary_stream[], char full_stream[], int version
} }
/* Character count indicator */ /* Character count indicator */
switch(version) { qr_bscan(full_stream, binary_stream[i + 1], 2 << version); /* version = 2..3 */
case 3:
if(binary_stream[i + 1] & 0x10) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 2:
if(binary_stream[i + 1] & 0x08) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x04) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x02) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x01) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
}
i += 2; i += 2;
break; break;
@@ -1660,14 +1461,7 @@ void microqr_expand_binary(char binary_stream[], char full_stream[], int version
} }
/* Character count indicator */ /* Character count indicator */
switch(version) { qr_bscan(full_stream, binary_stream[i + 1], 1 << version); /* version = 2..3 */
case 3:
if(binary_stream[i + 1] & 0x08) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
case 2:
if(binary_stream[i + 1] & 0x04) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x02) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
if(binary_stream[i + 1] & 0x01) { concat(full_stream, "1"); } else { concat(full_stream, "0"); }
}
i += 2; i += 2;
break; break;
@@ -1721,8 +1515,7 @@ void micro_qr_m1(char binary_data[])
if(bits_left > 4) { if(bits_left > 4) {
remainder = (bits_left - 4) / 8; remainder = (bits_left - 4) / 8;
for(i = 0; i < remainder; i++) { for(i = 0; i < remainder; i++) {
if((i % 2) == 0) { concat(binary_data, "11101100"); } concat(binary_data, i & 1 ? "00010001" : "11101100");
if((i % 2) == 1) { concat(binary_data, "00010001"); }
} }
} }
concat(binary_data, "0000"); concat(binary_data, "0000");
@@ -1757,14 +1550,7 @@ void micro_qr_m1(char binary_data[])
/* Add Reed-Solomon codewords to binary data */ /* Add Reed-Solomon codewords to binary data */
for(i = 0; i < ecc_codewords; i++) { for(i = 0; i < ecc_codewords; i++) {
if(ecc_blocks[ecc_codewords - i - 1] & 0x80) { concat(binary_data, "1"); } else { concat(binary_data, "0"); } qr_bscan(binary_data, ecc_blocks[ecc_codewords - i - 1], 0x80);
if(ecc_blocks[ecc_codewords - i - 1] & 0x40) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x20) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x10) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x08) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x04) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x02) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x01) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
} }
} }
@@ -1803,8 +1589,7 @@ void micro_qr_m2(char binary_data[], int ecc_mode)
bits_left = bits_total - strlen(binary_data); bits_left = bits_total - strlen(binary_data);
remainder = bits_left / 8; remainder = bits_left / 8;
for(i = 0; i < remainder; i++) { for(i = 0; i < remainder; i++) {
if((i % 2) == 0) { concat(binary_data, "11101100"); } concat(binary_data, i & 1 ? "00010001" : "11101100");
if((i % 2) == 1) { concat(binary_data, "00010001"); }
} }
} }
@@ -1832,14 +1617,7 @@ void micro_qr_m2(char binary_data[], int ecc_mode)
/* Add Reed-Solomon codewords to binary data */ /* Add Reed-Solomon codewords to binary data */
for(i = 0; i < ecc_codewords; i++) { for(i = 0; i < ecc_codewords; i++) {
if(ecc_blocks[ecc_codewords - i - 1] & 0x80) { concat(binary_data, "1"); } else { concat(binary_data, "0"); } qr_bscan(binary_data, ecc_blocks[ecc_codewords - i - 1], 0x80);
if(ecc_blocks[ecc_codewords - i - 1] & 0x40) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x20) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x10) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x08) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x04) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x02) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x01) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
} }
return; return;
@@ -1892,8 +1670,7 @@ void micro_qr_m3(char binary_data[], int ecc_mode)
if(bits_left > 4) { if(bits_left > 4) {
remainder = (bits_left - 4) / 8; remainder = (bits_left - 4) / 8;
for(i = 0; i < remainder; i++) { for(i = 0; i < remainder; i++) {
if((i % 2) == 0) { concat(binary_data, "11101100"); } concat(binary_data, i & 1 ? "00010001" : "11101100");
if((i % 2) == 1) { concat(binary_data, "00010001"); }
} }
} }
concat(binary_data, "0000"); concat(binary_data, "0000");
@@ -1939,14 +1716,7 @@ void micro_qr_m3(char binary_data[], int ecc_mode)
/* Add Reed-Solomon codewords to binary data */ /* Add Reed-Solomon codewords to binary data */
for(i = 0; i < ecc_codewords; i++) { for(i = 0; i < ecc_codewords; i++) {
if(ecc_blocks[ecc_codewords - i - 1] & 0x80) { concat(binary_data, "1"); } else { concat(binary_data, "0"); } qr_bscan(binary_data, ecc_blocks[ecc_codewords - i - 1], 0x80);
if(ecc_blocks[ecc_codewords - i - 1] & 0x40) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x20) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x10) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x08) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x04) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x02) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x01) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
} }
return; return;
@@ -1988,8 +1758,7 @@ void micro_qr_m4(char binary_data[], int ecc_mode)
bits_left = bits_total - strlen(binary_data); bits_left = bits_total - strlen(binary_data);
remainder = bits_left / 8; remainder = bits_left / 8;
for(i = 0; i < remainder; i++) { for(i = 0; i < remainder; i++) {
if((i % 2) == 0) { concat(binary_data, "11101100"); } concat(binary_data, i & 1 ? "00010001" : "11101100");
if((i % 2) == 1) { concat(binary_data, "00010001"); }
} }
} }
@@ -2018,14 +1787,7 @@ void micro_qr_m4(char binary_data[], int ecc_mode)
/* Add Reed-Solomon codewords to binary data */ /* Add Reed-Solomon codewords to binary data */
for(i = 0; i < ecc_codewords; i++) { for(i = 0; i < ecc_codewords; i++) {
if(ecc_blocks[ecc_codewords - i - 1] & 0x80) { concat(binary_data, "1"); } else { concat(binary_data, "0"); } qr_bscan(binary_data, ecc_blocks[ecc_codewords - i - 1], 0x80);
if(ecc_blocks[ecc_codewords - i - 1] & 0x40) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x20) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x10) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x08) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x04) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x02) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
if(ecc_blocks[ecc_codewords - i - 1] & 0x01) { concat(binary_data, "1"); } else { concat(binary_data, "0"); }
} }
} }
@@ -2159,10 +1921,21 @@ int micro_apply_bitmask(unsigned char *grid, int size)
mask[(y * size) + x] = 0x00; mask[(y * size) + x] = 0x00;
if (!(grid[(y * size) + x] & 0xf0)) { if (!(grid[(y * size) + x] & 0xf0)) {
if((y % 2) == 0) { mask[(y * size) + x] += 0x01; } if((y & 1) == 0) {
if((((y / 2) + (x / 3)) % 2) == 0) { mask[(y * size) + x] += 0x02; } mask[(y * size) + x] += 0x01;
if(((((y * x) % 2) + ((y * x) % 3)) % 2) == 0) { mask[(y * size) + x] += 0x04; } }
if(((((y + x) % 2) + ((y * x) % 3)) % 2) == 0) { mask[(y * size) + x] += 0x08; }
if((((y / 2) + (x / 3)) & 1) == 0) {
mask[(y * size) + x] += 0x02;
}
if(((((y * x) & 1) + ((y * x) % 3)) & 1) == 0) {
mask[(y * size) + x] += 0x04;
}
if(((((y + x) & 1) + ((y * x) % 3)) & 1) == 0) {
mask[(y * size) + x] += 0x08;
}
} }
} }
} }
@@ -2229,7 +2002,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
if(length > 35) { if(length > 35) {
strcpy(symbol->errtxt, "Input data too long"); strcpy(symbol->errtxt, "Input data too long");
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
for(i = 0; i < 4; i++) { for(i = 0; i < 4; i++) {
@@ -2261,7 +2034,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
} while ((j < 6843) && (glyph == 0)); } while ((j < 6843) && (glyph == 0));
if(glyph == 0) { if(glyph == 0) {
strcpy(symbol->errtxt, "Invalid character in input data"); strcpy(symbol->errtxt, "Invalid character in input data");
return ERROR_INVALID_DATA; return ZERROR_INVALID_DATA;
} }
jisdata[i] = glyph; jisdata[i] = glyph;
} }
@@ -2321,7 +2094,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
if(binary_count[2] > 84) { version_valid[2] = 0; } if(binary_count[2] > 84) { version_valid[2] = 0; }
if(binary_count[3] > 128) { if(binary_count[3] > 128) {
strcpy(symbol->errtxt, "Input data too long"); strcpy(symbol->errtxt, "Input data too long");
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
/* Eliminate possible versions depending on error correction level specified */ /* Eliminate possible versions depending on error correction level specified */
@@ -2332,7 +2105,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
if(ecc_level == LEVEL_H) { if(ecc_level == LEVEL_H) {
strcpy(symbol->errtxt, "Error correction level H not available"); strcpy(symbol->errtxt, "Error correction level H not available");
return ERROR_INVALID_OPTION; return ZERROR_INVALID_OPTION;
} }
if(ecc_level == LEVEL_Q) { if(ecc_level == LEVEL_Q) {
@@ -2341,7 +2114,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
version_valid[2] = 0; version_valid[2] = 0;
if(binary_count[3] > 80) { if(binary_count[3] > 80) {
strcpy(symbol->errtxt, "Input data too long"); strcpy(symbol->errtxt, "Input data too long");
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
} }
@@ -2351,7 +2124,7 @@ int microqr(struct zint_symbol *symbol, unsigned char source[], int length)
if(binary_count[2] > 68) { version_valid[2] = 0; } if(binary_count[2] > 68) { version_valid[2] = 0; }
if(binary_count[3] > 112) { if(binary_count[3] > 112) {
strcpy(symbol->errtxt, "Input data too long"); strcpy(symbol->errtxt, "Input data too long");
return ERROR_TOO_LONG; return ZERROR_TOO_LONG;
} }
} }