Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

Thanks to work being done at SF!
This commit is contained in:
Robin Stuart 2018-02-15 10:47:59 +00:00
commit 749eb55321
6 changed files with 22 additions and 11 deletions

View file

@ -1015,7 +1015,7 @@ int emf_plot(struct zint_symbol *symbol) {
if (symbol->output_options & BARCODE_STDOUT) {
emf_file = stdout;
} else {
emf_file = fopen(symbol->outfile, "w");
emf_file = fopen(symbol->outfile, "wb");
}
if (emf_file == NULL) {
strcpy(symbol->errtxt, "640: Could not open output file");

View file

@ -294,10 +294,5 @@ int tif_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
fclose(tif_file);
}
#ifdef _MSC_VER
free(strip_offset);
free(strip_bytes);
#endif
return 0;
}