From c52032acb29077a1d3129aebd854a26c6ddb0289 Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Fri, 12 May 2017 14:16:59 +0200 Subject: [PATCH] Update win c6 makefile and tcl backend to version 2.6.0 --- backend/dmatrix.c | 10 ++++++---- backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint.c | 6 ++++-- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/backend/dmatrix.c b/backend/dmatrix.c index 6850fb32..2cde5690 100644 --- a/backend/dmatrix.c +++ b/backend/dmatrix.c @@ -1219,13 +1219,14 @@ int data_matrix_200(struct zint_symbol *symbol, const unsigned char source[], co // Print Codewords #ifdef DEBUG { - int CWCount; + int CWCount; + int posCur; if (skew) CWCount = 1558 + 620; else CWCount = bytes + rsblock * (bytes / datablock); printf("Codewords (%i):", CWCount); - for (int posCur = 0; posCur < CWCount; posCur++) + for (posCur = 0; posCur < CWCount; posCur++) printf(" %3i", binary[posCur]); puts("\n"); } @@ -1253,10 +1254,11 @@ int data_matrix_200(struct zint_symbol *symbol, const unsigned char source[], co #ifdef DEBUG // Print position matrix as in standard for (y = NR - 1; y >= 0; y--) { - for (x = 0; x < NC; x++) { + for (x = 0; x < NC; x++) { + int v; if (x != 0) fprintf(stderr, "|"); - int v = places[(NR - y - 1) * NC + x]; + v = places[(NR - y - 1) * NC + x]; fprintf(stderr, "%3d.%2d", (v >> 3), 8 - (v & 7)); } fprintf(stderr, "\n"); diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index f9e228ed..5515730d 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.5.3]) +AC_INIT([zint], [2.6.0]) #-------------------------------------------------------------------- # 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 c1ef247a..35085a34 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.5.3\ +package ifneeded zint 2.6.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 60b72aaa..66d0d301 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -39,7 +39,9 @@ 2016-10-14 2.5.2 HaO - Include the upstream reverted image format 2016-12-12 2.5.3 HaO -- No changes here, take 2.5.1 framework files +- No changes here, take 2.5.1 framework files + 2017-05-12 2.6.0 HaO +- No changes here, take 2.6 framework files */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -79,7 +81,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.5.3" +#define VERSION "2.6.0" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index 23a9677c..a80c1e21 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.5.1\"" /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 BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /YX /FD /GZ /D ZINT_VERSION="\"2.5\"" /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.6\"" /c # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe