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

vector.c: string halign; POSTNET/PLANET: 1 module space; ZBarcode_Cap(); GUI settings

Browse Source
This commit is contained in:
gitlost
2020-09-30 12:19:12 +01:00
parent 3f5ac34057
commit 36c19053d7
169 changed files with 10975 additions and 8318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend_tcl/Makefile.in
View File

@ -65,6 +65,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
datarootdir = @datarootdir@
datadir = @datadir@
mandir = @mandir@
includedir = @includedir@
@ -176,7 +177,7 @@ libraries:
doc:
install: all install-binaries install-libraries install-doc
install: all install-binaries install-libraries
install-binaries: binaries install-lib-binaries install-bin-binaries
@mkdir -p $(DESTDIR)$(pkglibdir)

8576
backend_tcl/configure vendored Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

18
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.9.0])
AC_INIT([zint], [2.9.1.9])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
@ -71,7 +71,6 @@ TEA_ADD_SOURCES([
../backend/auspost.c
../backend/aztec.c
../backend/bmp.c
../backend/emf.c
../backend/codablock.c
../backend/code128.c
../backend/code16k.c
@ -84,9 +83,10 @@ TEA_ADD_SOURCES([
../backend/dmatrix.c
../backend/dotcode.c
../backend/eci.c
../backend/gb18030.c
../backend/gb2312.c
../backend/general_field.c
../backend/emf.c
../backend/gb18030.c
../backend/gb2312.c
../backend/general_field.c
../backend/gif.c
../backend/gridmtx.c
../backend/gs1.c
@ -94,10 +94,10 @@ TEA_ADD_SOURCES([
../backend/imail.c
../backend/large.c
../backend/library.c
../backend/mailmark.c
../backend/mailmark.c
../backend/maxicode.c
../backend/medical.c
../backend/output.c
../backend/output.c
../backend/pcx.c
../backend/pdf417.c
../backend/plessey.c
@ -108,11 +108,13 @@ TEA_ADD_SOURCES([
../backend/raster.c
../backend/reedsol.c
../backend/rss.c
../backend/sjis.c
../backend/sjis.c
../backend/svg.c
../backend/telepen.c
../backend/tif.c
../backend/ultra.c
../backend/upcean.c
../backend/vector.c
zint.c
])
TEA_ADD_CFLAGS([-I../backend -DNO_PNG=1 -DZINT_VERSION=PACKAGE_VERSION])

72
backend_tcl/zint.c
View File

@ -156,9 +156,6 @@ static int Zint(ClientData unused, Tcl_Interp *interp, int objc,
Tcl_Obj *CONST objv[]);
static int Encode(Tcl_Interp *interp, int objc,
Tcl_Obj *CONST objv[]);
static int is_fullmultibyte(struct zint_symbol* symbol);
static int is_stackable(const int symbology);
static int is_extendable(const int symbology);
/*----------------------------------------------------------------------------*/
/* >>>> File Global Variables */
@ -1004,15 +1001,15 @@ static int Encode(Tcl_Interp *interp, int objc,
/*------------------------------------------------------------------------*/
/* >>> option_3 is set by two values depending on the symbology */
/* On wrong symbology, the option is ignored(as does the zint program)*/
if (fFullMultiByte && is_fullmultibyte(hSymbol)) {
if (fFullMultiByte && ZBarcode_Cap(hSymbol->symbology, ZINT_CAP_FULL_MULTIBYTE)) {
hSymbol->option_3 = ZINT_FULL_MULTIBYTE;
} else if (Separator && is_stackable(hSymbol->symbology)) {
} else if (Separator && ZBarcode_Cap(hSymbol->symbology, ZINT_CAP_STACKABLE)) {
hSymbol->option_3 = Separator;
}
/*------------------------------------------------------------------------*/
/* >>> option_2 is set by two values depending on the symbology */
/* On wrong symbology, the option is ignored(as does the zint program)*/
if (addon_gap && is_extendable(hSymbol->symbology)) {
if (addon_gap && ZBarcode_Cap(hSymbol->symbology, ZINT_CAP_EXTENDABLE)) {
hSymbol->option_2 = addon_gap;
}
/*------------------------------------------------------------------------*/
@ -1061,7 +1058,7 @@ static int Encode(Tcl_Interp *interp, int objc,
{
Tcl_SetObjResult(interp, Tcl_NewStringObj(hSymbol->errtxt, -1));
}
if( 5 <= ErrorNumber )
if( ZINT_ERROR <= ErrorNumber )
{
/* >> Encode error */
fError = 1;
@ -1131,64 +1128,3 @@ static int Encode(Tcl_Interp *interp, int objc,
}
return TCL_OK;
}
static int is_fullmultibyte(struct zint_symbol* symbol) {
switch (symbol->symbology) {
case BARCODE_QRCODE:
case BARCODE_MICROQR:
//case BARCODE_HIBC_QR: Note character set restricted to ASCII subset
//case BARCODE_UPNQR: Note does not use Kanji mode
case BARCODE_RMQR:
case BARCODE_HANXIN:
case BARCODE_GRIDMATRIX:
return 1;
}
return 0;
}
/* Indicates which symbologies can have row binding
* Note: if change this must also change version in backend/common.c */
static int is_stackable(const int symbology) {
if (symbology < BARCODE_PDF417) {
return 1;
}
switch (symbology) {
case BARCODE_CODE128B:
case BARCODE_ISBNX:
case BARCODE_EAN14:
case BARCODE_NVE18:
case BARCODE_KOREAPOST:
case BARCODE_PLESSEY:
case BARCODE_TELEPEN_NUM:
case BARCODE_ITF14:
case BARCODE_CODE32:
case BARCODE_CODABLOCKF:
case BARCODE_HIBC_BLOCKF:
return 1;
}
return 0;
}
/* Indicates which symbols can have addon (EAN-2 and EAN-5)
* Note: if change this must also change version in backend/common.c */
static int is_extendable(const int symbology) {
switch (symbology) {
case BARCODE_EANX:
case BARCODE_EANX_CHK:
case BARCODE_UPCA:
case BARCODE_UPCA_CHK:
case BARCODE_UPCE:
case BARCODE_UPCE_CHK:
case BARCODE_ISBNX:
case BARCODE_EANX_CC:
case BARCODE_UPCA_CC:
case BARCODE_UPCE_CC:
return 1;
}
return 0;
}