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

Fix batch bugs: 1) interpretation of former code included in next if shorter, wrong eof detection issed wrong warning

Browse Source
This commit is contained in:
Harald Oehlmann 2015-08-18 14:17:59 +02:00
parent 36a2830562
commit 994c5adb10
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/library.c
View File

@ -88,7 +88,7 @@ void ZBarcode_Clear(struct zint_symbol *symbol)
} }
symbol->rows = 0; symbol->rows = 0;
symbol->width = 0; symbol->width = 0;
symbol->text[0] = '\0'; memset(symbol->text,0,128);
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';
if (symbol->bitmap != NULL) if (symbol->bitmap != NULL)
{ {

7
frontend/main.c
View File

@ -223,7 +223,12 @@ int batch_process(struct zint_symbol *symbol, char *filename)
} }
do { do {
character = fgetc(file); int intChar;
intChar = fgetc(file);
if (intChar == EOF) {
break;
}
character = (unsigned char) intChar;
if(character == '\n') { if(character == '\n') {
if(buffer[posn - 1] == '\r') { if(buffer[posn - 1] == '\r') {
/* CR+LF - assume Windows formatting and remove CR */ /* CR+LF - assume Windows formatting and remove CR */