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

Add NULL character support to QR Code

Browse Source
This commit is contained in:
hooper114 2009-08-08 15:25:17 +00:00
parent 501b040c0b
commit 0695eed70c
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/qr.c
View File

@ -26,7 +26,7 @@
#ifndef NO_QR #ifndef NO_QR
#include <qrencode.h> #include <qrencode.h>
QRcode *encode(int security, int size, const unsigned char *intext, int kanji) QRcode *encode(int security, int size, const unsigned char *intext, int kanji, char nullchar, int input_length)
{ {
int version; int version;
QRecLevel level; QRecLevel level;
@ -55,7 +55,13 @@ QRcode *encode(int security, int size, const unsigned char *intext, int kanji)
version = 0; version = 0;
} }
code = QRcode_encodeString((char*)intext, version, level, hint, 1); if(nullchar == '\0') {
/* No NULL characters in data */
code = QRcode_encodeString((char*)intext, version, level, hint, 1);
} else {
/* NULL characters in data */
code = QRcode_encodeString8bit((char*)intext, version, level, input_length);
}
return code; return code;
} }
@ -66,10 +72,30 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[])
/*int errno = 0;*/ /*int errno = 0;*/
int i, j; int i, j;
int kanji; int kanji;
int input_length;
char nullify;
input_length = ustrlen(source);
nullify = symbol->nullchar;
if((symbol->input_mode == KANJI_MODE) || (symbol->input_mode == SJIS_MODE)) { kanji = 1; } else { kanji = 0; } if((symbol->input_mode == KANJI_MODE) || (symbol->input_mode == SJIS_MODE)) { kanji = 1; } else { kanji = 0; }
code = encode(symbol->option_1, symbol->option_2, source, kanji); /* Null character handling */
j = 0;
if(nullify != '\0') {
for(i = 0; i < input_length; i++) {
if(source[i] == nullify) {
source[i] = '\0';
j++;
}
}
}
if(j == 0) {
/* nullchar was set but there are no NULL characters in the input data */
nullify = '\0';
}
code = encode(symbol->option_1, symbol->option_2, source, kanji, nullify, input_length);
if(code == NULL) { if(code == NULL) {
strcpy(symbol->errtxt, "libqrencode failed to encode the input data"); strcpy(symbol->errtxt, "libqrencode failed to encode the input data");
return ERROR_ENCODING_PROBLEM; return ERROR_ENCODING_PROBLEM;