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

Make compile with MS-VC and set release version 2.6.2 in various files

Browse Source 
Attention: qtzint.exe core dumpfs for me
This commit is contained in:
Harald Oehlmann 2017-10-23 17:07:30 +02:00
parent 73c9b502b5
commit 4b03bccba0
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/render.c
View File

@ -254,9 +254,10 @@ int render_plot(struct zint_symbol *symbol, float width, float height) {
else if (symbol->symbology == BARCODE_CODE49) { else if (symbol->symbology == BARCODE_CODE49) {
/* The minimum X-dimension of Code 49 is 0.191mm */ /* The minimum X-dimension of Code 49 is 0.191mm */
if (x_dimension < 0.191) { if (x_dimension < 0.191) {
float encoded_symbol_aspect;
x_dimension = 0.191; x_dimension = 0.191;
width = 0.191 * GL_CONST * total_area_width_x; 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); encoded_symbol_aspect /= (preset_height + (2 * yoffset) + text_offset + text_height);
height = width / encoded_symbol_aspect; height = width / encoded_symbol_aspect;
} }

4
backend_qt/backend_qt.pro
View File

@ -19,7 +19,7 @@ TARGET = QtZint
INCLUDEPATH += ../backend INCLUDEPATH += ../backend
#EDIT THIS !!!! #EDIT THIS !!!!
DEFINES += ZINT_VERSION="\\\"2.5.1\\\"" DEFINES += ZINT_VERSION="\\\"2.6.2\\\""
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng INCLUDEPATH += ../../lpng
@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \ ../backend/png.c \
qzint.cpp qzint.cpp
VERSION = 2.5.0 VERSION = 2.6.2
#DESTDIR = . #DESTDIR = .

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files. # 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. # Call TEA_INIT as the first TEA_ macro to set up initial vars.

2
backend_tcl/lib/zint/pkgIndex.tcl
View File

@ -1,2 +1,2 @@
package ifneeded zint 2.6.1\ package ifneeded zint 2.6.2\
[list load [file join $dir zint[info sharedlibextension]]] [list load [file join $dir zint[info sharedlibextension]]]

4
backend_tcl/zint.c
View File

@ -47,6 +47,8 @@
- EAN/UPC Codes with included check digit - EAN/UPC Codes with included check digit
- UPNQR Code - UPNQR Code
- Misspelled symbology: AztecRunes - Misspelled symbology: AztecRunes
2017-10-23 2.6.2 HaO
- Framework 2.6.2 bugfixes
*/ */
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -86,7 +88,7 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* > File option defines */ /* > File option defines */
#define VERSION "2.6.1" #define VERSION "2.6.2"
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */ /* >>>>> Hepler defines */

2
win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
View File

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe