mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-30 14:55:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Full multibyte option_3 for QR, HANXIN, GRIDMATRIX

Browse source
This commit is contained in:
gitlost 2020-04-02 14:41:13 +01:00
parent f02851b3c1
commit 61cd413fe4
18 changed files with 653 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/hanxin.c
View file

@ -34,7 +34,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef _MSC_VER
#include <malloc.h>
#endif
@ -1377,6 +1376,7 @@ INTERNAL int han_xin(struct zint_symbol *symbol, const unsigned char source[], s
int est_binlen;
int ecc_level = symbol->option_1;
int i, j, version;
int full_multibyte;
int data_codewords = 0, size;
int codewords;
int bitmask;
@ -1398,13 +1398,15 @@ INTERNAL int han_xin(struct zint_symbol *symbol, const unsigned char source[], s
unsigned char *grid;
#endif
full_multibyte = symbol->option_3 == ZINT_FULL_MULTIBYTE; /* If set use Hanzi mode in DATA_MODE or for single-byte Latin */
if ((symbol->input_mode & 0x07) == DATA_MODE) {
gb18030_cpy(source, &length, gbdata);
gb18030_cpy(source, &length, gbdata, full_multibyte);
} else {
int done = 0;
if (symbol->eci != 29) { /* Unless ECI 29 (GB) */
/* Try single byte (Latin) conversion first */
int error_number = gb18030_utf8tosb(symbol->eci && symbol->eci <= 899 ? symbol->eci : 3, source, &length, gbdata);
int error_number = gb18030_utf8tosb(symbol->eci && symbol->eci <= 899 ? symbol->eci : 3, source, &length, gbdata, full_multibyte);
if (error_number == 0) {
done = 1;
} else if (symbol->eci && symbol->eci <= 899) {