From 4b03bccba033425e5f718f601909a368aa2ac943 Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Mon, 23 Oct 2017 17:07:30 +0200 Subject: [PATCH] Make compile with MS-VC and set release version 2.6.2 in various files Attention: qtzint.exe core dumpfs for me --- backend/render.c | 3 ++- backend_qt/backend_qt.pro | 4 ++-- backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint.c | 4 +++- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/backend/render.c b/backend/render.c index 70d30154..991e6316 100644 --- a/backend/render.c +++ b/backend/render.c @@ -254,9 +254,10 @@ int render_plot(struct zint_symbol *symbol, float width, float height) { else if (symbol->symbology == BARCODE_CODE49) { /* The minimum X-dimension of Code 49 is 0.191mm */ if (x_dimension < 0.191) { + float encoded_symbol_aspect; x_dimension = 0.191; width = 0.191 * GL_CONST * total_area_width_x; - float encoded_symbol_aspect = total_area_width_x; + encoded_symbol_aspect = total_area_width_x; encoded_symbol_aspect /= (preset_height + (2 * yoffset) + text_offset + text_height); height = width / encoded_symbol_aspect; } diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 849608e1..cfd87a1e 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -19,7 +19,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.5.1\\\"" +DEFINES += ZINT_VERSION="\\\"2.6.2\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \ ../backend/png.c \ qzint.cpp -VERSION = 2.5.0 +VERSION = 2.6.2 #DESTDIR = . diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index d97d9a8c..8dd269e7 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.1]) +AC_INIT([zint], [2.6.2]) #-------------------------------------------------------------------- # 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 0c5ca94f..9199440a 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.6.1\ +package ifneeded zint 2.6.2\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 17792d5c..cce191ab 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -47,6 +47,8 @@ - EAN/UPC Codes with included check digit - UPNQR Code - Misspelled symbology: AztecRunes + 2017-10-23 2.6.2 HaO +- Framework 2.6.2 bugfixes */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -86,7 +88,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.6.1" +#define VERSION "2.6.2" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index a80c1e21..988d7ee6 100644 --- a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp +++ b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6.2\"" /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe