Add GS1data support

This commit is contained in:
hooper114 2009-08-09 08:45:58 +00:00
parent 0695eed70c
commit 06cc245516

View File

@ -25,17 +25,24 @@
#ifndef NO_QR #ifndef NO_QR
#include <qrencode.h> #include <qrencode.h>
#include <stdio.h>
QRcode *encode(int security, int size, const unsigned char *intext, int kanji, char nullchar, int input_length) QRcode *encode(int security, int size, const unsigned char *intext, int kanji, int gs1, char nullchar, int input_length)
{ {
int version; int version;
QRecLevel level; QRecLevel level;
QRencodeMode hint; QRencodeMode hint;
QRcode *code; QRcode *code;
hint = 0;
if(kanji) { if(kanji) {
hint = QR_MODE_KANJI; hint = QR_MODE_KANJI;
} else { }
if(gs1) {
hint = QR_MODE_GS1;
}
if(hint == 0) {
hint = QR_MODE_8; hint = QR_MODE_8;
} }
@ -71,13 +78,14 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[])
QRcode *code; QRcode *code;
/*int errno = 0;*/ /*int errno = 0;*/
int i, j; int i, j;
int kanji; int kanji, gs1;
int input_length; int input_length;
char nullify; char nullify;
input_length = ustrlen(source); input_length = ustrlen(source);
nullify = symbol->nullchar; 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; }
if(symbol->input_mode == GS1_MODE) { gs1 = 1; } else { gs1 = 0; }
/* Null character handling */ /* Null character handling */
j = 0; j = 0;
@ -95,7 +103,7 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[])
nullify = '\0'; nullify = '\0';
} }
code = encode(symbol->option_1, symbol->option_2, source, kanji, nullify, input_length); code = encode(symbol->option_1, symbol->option_2, source, kanji, gs1, 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;