mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct Chinese char encoding in Han Xin

Browse Source 
Testing revealed a couple of bugs with encoding Chinese characters, also added more useful debug info
This commit is contained in:
Robin Stuart 2019-11-17 14:56:43 +00:00
parent 793a990c01
commit 1fa7f2b804
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/hanxin.c
View File

@ -1,7 +1,7 @@
/* hanxin.c - Han Xin Code /* hanxin.c - Han Xin Code
libzint - the open source barcode library libzint - the open source barcode library
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com> Copyright (C) 2009-2019 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
@ -451,7 +451,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
bin_append(encoding_value, 6, binary); bin_append(encoding_value, 6, binary);
if (debug) { if (debug) {
printf("%c (%d) ", (char) source[i], encoding_value); printf("%.2x [ASC %.2x] ", encoding_value, source[i + position]);
} }
i++; i++;
} }
@ -514,7 +514,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
/* Subset 2 */ /* Subset 2 */
if ((first_byte >= 0xa1) && (first_byte <= 0xa3)) { if ((first_byte >= 0xa1) && (first_byte <= 0xa3)) {
if ((second_byte >= 0xa1) && (second_byte <= 0xfe)) { if ((second_byte >= 0xa1) && (second_byte <= 0xfe)) {
glyph = (0x5e * first_byte - 0xa1) + (second_byte - 0xa1) + 0xeb0; glyph = (0x5e * (first_byte - 0xa1)) + (second_byte - 0xa1) + 0xeb0;
} }
} }
@ -524,7 +524,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
} }
if (debug) { if (debug) {
printf("%d ", glyph); printf("%.4x [GB %.4x] ", glyph, source[i + position]);
} }
bin_append(glyph, 12, binary); bin_append(glyph, 12, binary);
@ -557,7 +557,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
glyph = (0x5e * (first_byte - 0xd8)) + (second_byte - 0xa1); glyph = (0x5e * (first_byte - 0xd8)) + (second_byte - 0xa1);
if (debug) { if (debug) {
printf("%d ", glyph); printf("%.4x [GB %.4x] ", glyph, source[i + position]);
} }
bin_append(glyph, 12, binary); bin_append(glyph, 12, binary);
@ -593,7 +593,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
} }
if (debug) { if (debug) {
printf("%d ", glyph); printf("%.4x ", glyph);
} }
bin_append(glyph, 15, binary); bin_append(glyph, 15, binary);
@ -634,7 +634,7 @@ static void calculate_binary(char binary[], char mode[], int source[], const siz
printf("%d ", glyph); printf("%d ", glyph);
} }
bin_append(glyph, 15, binary); bin_append(glyph, 21, binary);
i += 2; i += 2;
} }
@ -1430,8 +1430,6 @@ int han_xin(struct zint_symbol *symbol, const unsigned char source[], size_t len
data_codewords = hx_data_codewords_L4[version - 1]; data_codewords = hx_data_codewords_L4[version - 1];
} }
//printf("Version %d, ECC %d\n", version, ecc_level);
size = (version * 2) + 21; size = (version * 2) + 21;
#ifndef _MSC_VER #ifndef _MSC_VER
@ -1456,6 +1454,15 @@ int han_xin(struct zint_symbol *symbol, const unsigned char source[], size_t len
} }
} }
if (symbol->debug) {
printf("Datastream length: %d\n", data_codewords);
printf("Datastream:\n");
for (i = 0; i < data_codewords; i++) {
printf("%.2x ", datastream[i]);
}
printf("\n");
}
hx_setup_grid(grid, size, version); hx_setup_grid(grid, size, version);
hx_add_ecc(fullstream, datastream, version, ecc_level); hx_add_ecc(fullstream, datastream, version, ecc_level);