Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-05-01 19:55:29 +00:00
Code Issues Projects Releases Wiki Activity

debian: updated using https://salsa.debian.org/debian/zint as

Browse Source 
template, props Dmitry Smirnov (ticket #147, props John Crisp);
  TODO: enable building with the GS1 Syntax Engine;
  this involved auditing copyrights which prompted the next item
  re "tif.c" and will prompt the next next item "pdf417.c"
tif.c: replaced LZW compression with tree-based one due to
  "tif_lzw.h"'s original BSD-TAHOE license which has the equivalent
  of the "advertising clause", new implementation (which is much
  faster anyway) props Harald Kuhr and Bob Montgomery
pdf417.c: TODO: Replace all code adapted from "pdf417.frm" as it
  was released under GPL v2.0 or later
pdf417.h: replace unnecessary "pdf417.frm" references with ISO/IEC
  standard as 1st step re above, some expanded comments
general: Codablock-F -> Codablock F (i.e. lose hyphen)
cmake: frontend/frontend_qt: go back to only setting RPATH on macOS
  as not Debian compatible and it seems it's not a good idea on
  Linux anyway; TODO: check BSD + other Unixes
CLI/GUI: make "--verbose" option official and document
tools/gen_eci_sb_h.php/gen_eci_mb_h.php: add SPDX Unicode-3.0;
  update haible.de/bruno tarball info - "GB18030.TXT" no longer in
  "jdk-1.4.2/" so mention "libiconv-1.11/" version instead (same)
general: add various SPDXs and normalize some Copyrights
reedsol.c: malloced `logt`/`alog` tables int -> short (slight
  performance improvement)
aztec.c: add copyrights, some code fiddling
BWIPP: update to latest
This commit is contained in:
gitlost
2026-03-18 15:08:32 +00:00
parent db03f0b304
commit df64a0f237
70 changed files with 1404 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/CMakeLists.txt
View File

@@ -24,8 +24,10 @@ if(NOT HAVE_GETOPT_LONG_ONLY)
target_link_libraries(${PROJECT_NAME} zint_bundled_getopt)
endif()
get_property(libdir GLOBAL PROPERTY ZINT_LIBDIR)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${libdir}")
if(APPLE AND NOT CMAKE_INSTALL_RPATH)
get_property(libdir GLOBAL PROPERTY ZINT_LIBDIR)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${libdir}")
endif()
install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" RUNTIME)
if(UNIX)

16
frontend/main.c
View File

@@ -106,7 +106,7 @@ static void types(void) {
"28 FLAT Flattermarken 104 HIBC_QR HIBC QR Code\n"
"29 DBAR_OMN GS1 DataBar Omni 106 HIBC_PDF HIBC PDF417\n"
"30 DBAR_LTD GS1 DataBar Limited 108 HIBC_MICPDF HIBC MicroPDF417\n"
"31 DBAR_EXP GS1 DataBar Expanded 110 HIBC_BLOCKF HIBC Codablock-F\n", stdout);
"31 DBAR_EXP GS1 DataBar Expanded 110 HIBC_BLOCKF HIBC Codablock F\n", stdout);
fputs("32 TELEPEN Telepen Alpha 112 HIBC_AZTEC HIBC Aztec Code\n"
"34 UPCA UPC-A 115 DOTCODE DotCode\n"
"35 UPCA_CHK UPC-A + Check Digit 116 HANXIN Han Xin Code\n"
@@ -134,7 +134,7 @@ static void types(void) {
"71 DATAMATRIX Data Matrix 147 DXFILMEDGE DX Film Edge Barcode\n", stdout);
fputs("72 EAN14 EAN-14 (GS1-128 based) 148 EAN8_CC Composite EAN-8\n"
"73 VIN Vehicle Information No. 149 EAN13_CC Composite EAN-13\n"
"74 CODABLOCKF Codablock-F\n", stdout);
"74 CODABLOCKF Codablock F\n", stdout);
}
/* Output version information */
@@ -224,7 +224,7 @@ if (have_gs1syntaxengine) {
" --quietzones Add compliant quiet zones\n"
" -r, --reverse Reverse colours (white on black)\n"
" --rotate=INTEGER Rotate symbol by INTEGER (0, 90, 180, 270) degrees\n"
" --rows=INTEGER Set number of rows (Codablock-F/PDF417)\n", stdout);
" --rows=INTEGER Set number of rows (Codablock F/PDF417)\n", stdout);
fputs( " --scale=NUMBER Adjust size of X-dimension\n"
" --scalexdimdp=X[,R] Adjust size to X-dimension X at resolution R\n"
" --scmvv=INTEGER Prefix SCM with \"[)>\\R01\\Gvv\" (vv is INTEGER) (MaxiCode)\n"
@@ -236,11 +236,12 @@ if (have_gs1syntaxengine) {
" --structapp=I,C[,ID] Set Structured Append info (I index, C count)\n"
" -t, --types Display table of barcode types\n", stdout);
fputs( " --textgap=NUMBER Adjust gap between barcode and HRT in multiples of X-dim\n"
" --verbose Output debug info to stdout\n"
" --vers=INTEGER Set symbol version (size, check digits, other options)\n"
" -v, --version Display Zint version\n"
" --vwhitesp=INTEGER Set height of vertical whitespace in multiples of X-dim\n"
" -w, --whitesp=INTEGER Set width of horizontal whitespace in multiples of X-dim\n", stdout);
fputs( " --werror Convert all warnings into errors\n", stdout);
" --vwhitesp=INTEGER Set height of vertical whitespace in multiples of X-dim\n", stdout);
fputs( " -w, --whitesp=INTEGER Set width of horizontal whitespace in multiples of X-dim\n"
" --werror Convert all warnings into errors\n", stdout);
}
/* Display supported ECI codes */
@@ -1255,6 +1256,7 @@ static void win_free_args(void) {
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* SPDX-License-Identifier: LGPL-2.1-or-later */
static WCHAR **win_CommandLineToArgvW(const WCHAR *cmdline, int *numargs) {
int qcount, bcount;
const WCHAR *s;
@@ -1640,7 +1642,7 @@ int main(int argc, char **argv) {
#endif
{"textgap", 1, NULL, OPT_TEXTGAP},
{"types", 0, NULL, 't'},
{"verbose", 0, NULL, OPT_VERBOSE}, /* Currently undocumented, output some debug info */
{"verbose", 0, NULL, OPT_VERBOSE},
{"vers", 1, NULL, OPT_VERS},
{"version", 0, NULL, 'v'},
{"vwhitesp", 1, NULL, OPT_VWHITESP},

8
frontend/test.sh
View File

@@ -239,10 +239,10 @@ echo testing EAN-14
zint -o bar72.txt -b 72 -d 3210987654321
zint -o bar72.gif -b 72 --height=50 --border=10 -d 3210987654321
zint -o bar72.svg -b 72 --height=50 --border=10 -d 3210987654321
echo testing Codablock-F
zint -o bar74.txt -b 74 -d "Demonstration Codablock-F symbol generated by libzint"
zint -o bar74.gif -b 74 -d "Demonstration Codablock-F symbol generated by libzint"
zint -o bar74.svg -b 74 -d "Demonstration Codablock-F symbol generated by libzint"
echo testing Codablock F
zint -o bar74.txt -b 74 -d "Demonstration Codablock F symbol generated by libzint"
zint -o bar74.gif -b 74 -d "Demonstration Codablock F symbol generated by libzint"
zint -o bar74.svg -b 74 -d "Demonstration Codablock F symbol generated by libzint"
echo testing NVE-18
zint -o bar75.txt -b 75 -d 76543210987654321
zint -o bar75.gif -b 75 --height=50 --border=10 -d 76543210987654321