From 7fb7203a86284e23daf9586601cf6313fb49fbe9 Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Tue, 13 Feb 2018 16:37:46 +0100 Subject: [PATCH 1/3] Include VIN and MailMark symbologies --- backend_qt/backend_qt.pro | 1 + backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint.c | 19 +++++++++++++------ backend_tcl/zint_tcl.dsp | 4 ++++ win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 4 ++++ 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index cfd87a1e..40dcb60e 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -96,6 +96,7 @@ SOURCES += ../backend/2of5.c \ ../backend/imail.c \ ../backend/large.c \ ../backend/library.c \ + ../backend/mailmark.c \ ../backend/maxicode.c \ ../backend/medical.c \ ../backend/pcx.c \ diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index 8dd269e7..b12fcaa9 100644 --- a/backend_tcl/configure.in +++ b/backend_tcl/configure.in @@ -14,7 +14,7 @@ # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([zint], [2.6.2]) +AC_INIT([zint], [2.6.3]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index 9199440a..1b9b2530 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.6.2\ +package ifneeded zint 2.6.3\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 443e8d15..b039141b 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -49,7 +49,10 @@ - Misspelled symbology: AztecRunes 2017-10-23 2.6.2 HaO - Framework 2.6.2 bugfixes -- Allow dll unload +- Allow dll unload + 2018-02-13 2.6.3 HaO + - Framework trunk update + - Added VIN and MailMark symbologies. */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -89,7 +92,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.6.2" +#define VERSION "2.6.3" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ @@ -158,7 +161,8 @@ static char *s_code_list[] = { "ISBN", "RM4SCC", "Datamatrix", - "EAN14", + "EAN14", + "VIN", "CodablockF", "NVE18", "JapanPost", @@ -185,7 +189,8 @@ static char *s_code_list[] = { "HIBC-CodablockF", "HIBCAztec", "DotCode", - "HanXin", + "HanXin", + "MailMark", "AztecRunes", "Code32", "EAN-CC", @@ -251,7 +256,8 @@ static int s_code_number[] = { BARCODE_ISBNX, BARCODE_RM4SCC, BARCODE_DATAMATRIX, - BARCODE_EAN14, + BARCODE_EAN14, + BARCODE_VIN, BARCODE_CODABLOCKF, BARCODE_NVE18, BARCODE_JAPANPOST, @@ -278,7 +284,8 @@ static int s_code_number[] = { BARCODE_HIBC_BLOCKF, BARCODE_HIBC_AZTEC, BARCODE_DOTCODE, - BARCODE_HANXIN, + BARCODE_HANXIN, + BARCODE_MAILMARK, BARCODE_AZRUNE, BARCODE_CODE32, BARCODE_EANX_CC, diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index 669179f0..8613220b 100644 --- a/backend_tcl/zint_tcl.dsp +++ b/backend_tcl/zint_tcl.dsp @@ -184,6 +184,10 @@ SOURCE=..\backend\library.c # End Source File # Begin Source File +SOURCE=..\backend\mailmark.c +# End Source File +# Begin Source File + SOURCE=..\backend\maxicode.c # End Source File # Begin Source File diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index 988d7ee6..3d8f260f 100644 --- a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp +++ b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp @@ -188,6 +188,10 @@ SOURCE=..\..\backend\library.c # End Source File # Begin Source File +SOURCE=..\..\backend\mailmark.c +# End Source File +# Begin Source File + SOURCE=..\..\frontend\main.c # End Source File # Begin Source File From ee763cb1355c16fa9db7892a67563b5391a9e40c Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Tue, 13 Feb 2018 16:53:12 +0100 Subject: [PATCH 2/3] Do not free _alloca data --- backend/tif.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/tif.c b/backend/tif.c index 31e06a82..83f86ea7 100644 --- a/backend/tif.c +++ b/backend/tif.c @@ -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; } From 8bd26f5e83d971c1b7c911134e0f34d037d10b89 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Tue, 13 Feb 2018 18:32:26 +0000 Subject: [PATCH 3/3] Open EMF files in binary mode --- backend/emf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/emf.c b/backend/emf.c index c5944fe6..5a17643d 100644 --- a/backend/emf.c +++ b/backend/emf.c @@ -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");