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

2018-08-30 2.6.5 HaO Set version to 2.6.5

Browse Source
This commit is contained in:
Harald Oehlmann 2019-09-02 12:37:01 +02:00
parent b5aaf308a3
commit 40aab7908b
12 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set (ZINT_VERSION_MAJOR 2)
set (ZINT_VERSION_MINOR 6)
set (ZINT_VERSION_RELEASE 4)
set (ZINT_VERSION_RELEASE 5)
set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)

13
README
View File

@ -61,6 +61,19 @@ that the old -vers numbers for DMRE are re-assigned.
The separator of GS1-datamatrix may be switched from FNC1 to GS.
GS1 field length check AI 8009 and 7230 to 7239 currected.
Version 2.6.5:
Fixed bugs:
backend/main.c was missing
Maxicode bullseye rastering for scale = 0.5
Crash in uto to eci.
eci ISO 8859-16 table missing data line
upce check for 7 digit input (causes crash) and BARCODE_UPCE_CHK -> BARCODE_UPCE mapping removed
US imail check for invalid barcode identifier and allow 0/5/9/11 length zip
maxicode code set correction
cmake flags for debugging and sanitize options
unit tests for the changes, with a simple test suite based on qrencode/tests
CONTACT US
----------
The home of Zint is:

2
backend/zint.h
View File

@ -136,7 +136,7 @@ extern "C" {
#define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 6
#define ZINT_VERSION_RELEASE 4
#define ZINT_VERSION_RELEASE 5
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1

4
backend_qt/backend_qt.pro
View File

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

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
AC_INIT([zint], [2.6.4])
AC_INIT([zint], [2.6.5])
#--------------------------------------------------------------------
# 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.4\
package ifneeded zint 2.6.5\
[list load [file join $dir zint[info sharedlibextension]]]

25
backend_tcl/zint.c
View File

@ -57,6 +57,10 @@
- Framework trunk update
- Add options -bold, -dotted, -dotsize, -dmre, -eci
- Implemented ECI logic
2019-09-01 2.6.5 HaO
- Framework 2.6.5 update
- Add option -gssep
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -96,7 +100,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
#define VERSION "2.6.4"
#define VERSION "2.6.5"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */
@ -388,6 +392,7 @@ static char help_message[] = "zint tcl(stub,obj) dll\n"
" -dotsize number: radius ratio of dots from 0.01 to 1.0\n"
" -scale double: Scale the image to this factor\n"
" -format binary|unicode|gs1: input data format. Default:unicode\n"
" -gssep bool: for gs1, use gs as separator instead fnc1 (Datamatrix only)\n"
" -eci number: ECI to use\n"
" -notext bool: no interpretation line\n"
" -square bool: force Data Matrix symbols to be square\n"
@ -572,13 +577,13 @@ static int Encode(Tcl_Interp *interp, int objc,
/* Option list and indexes */
char *optionList[] = {
"-barcode", "-bg", "-bind", "-bold", "-border", "-box", "-cols",
"-dmre", "-dotsize", "-dotty", "-eci", "-fg", "-format", "-height",
"-init", "-mode", "-notext", "-primary", "-rotate", "-rows",
"-scale", "-secure", "-smalltext", "-square", "-to", "-vers",
"-whitesp", NULL};
"-dmre", "-dotsize", "-dotty", "-eci", "-fg", "-format", "-gssep",
"-height", "-init", "-mode", "-notext", "-primary", "-rotate",
"-rows", "-scale", "-secure", "-smalltext", "-square", "-to",
"-vers", "-whitesp", NULL};
enum iOption {
iBarcode, iBG, iBind, iBold, iBorder, iBox, iCols,
iDMRE, iDotSize, iDotty, iECI, iFG, iFormat, iHeight,
iDMRE, iDotSize, iDotty, iECI, iFG, iFormat, iGSSep, iHeight,
iInit, iMode, iNoText, iPrimary, iRotate, iRows,
iScale, iSecure, iSmallText, iSquare, iTo, iVers,
iWhiteSp
@ -603,6 +608,7 @@ static int Encode(Tcl_Interp *interp, int objc,
case iBox:
case iDMRE:
case iDotty:
case iGSSep:
case iInit:
case iNoText:
case iSmallText:
@ -704,6 +710,13 @@ static int Encode(Tcl_Interp *interp, int objc,
hSymbol->output_options &= ~BARCODE_DOTTY_MODE;
}
break;
case iGSSep:
if (intValue) {
hSymbol->output_options |= GS1_GS_SEPARATOR;
} else {
hSymbol->output_options &= ~GS1_GS_SEPARATOR;
}
break;
case iECI:
if(Tcl_GetIndexFromObj(interp, objv[optionPos+1],
(const char **) s_eci_list,"-eci", optionPos, &ECIIndex)

2
frontend_qt/mainwindow.cpp
View File

@ -265,7 +265,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.6.4</h2>"
tr("<h2>Zint Barcode Studio 2.6.5</h2>"
"<p>A free barcode generator"
"<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"

4
win32/zint_cmdline_vc6/zint.rc
View File

@ -50,7 +50,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "zint barcode generator\0"
VALUE "FileVersion", "2.6.4.0\0"
VALUE "FileVersion", "2.6.5.0\0"
VALUE "InternalName", "zint.exe\0"
VALUE "LegalCopyright", "Copyright © 2018 Robin Stuart\0"
VALUE "LegalTrademarks", "\0"
@ -58,7 +58,7 @@ BEGIN
VALUE "OriginalFilename", "zint.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "zint\0"
VALUE "ProductVersion", "2.6.4.0\0"
VALUE "ProductVersion", "2.6.5.0\0"
VALUE "SpecialBuild", "\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
END

2
win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
View File

@ -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.4\"" /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.5\"" /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe

2
zint.nsi
View File

@ -10,7 +10,7 @@
;******************************************************************************
!define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe"
!define PRODUCT_VERSION "2.6.3.0"
!define PRODUCT_VERSION "2.6.4.0"
!define PRODUCT_WEB_SITE "http://www.zint.org.uk"
!define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"

5
zint.spec
View File

@ -1,5 +1,5 @@
Name: zint
Version: 2.6.4
Version: 2.6.5
Release: 2%{?dist}
Summary: A barcode generator and library
License: GPLv3+
@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Sep 1 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.5
- Version -> 2.6.5
* Fri Aug 30 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.4
- Version -> 2.6.4