mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-30 06:45:28 -04:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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]]]

27
backend_tcl/zint.c
View file

@ -56,7 +56,11 @@
2018-11-02 2.6.4 HaO
- Framework trunk update
- Add options -bold, -dotted, -dotsize, -dmre, -eci
- Implemented ECI logic
- 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)