Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-02-01 16:25:59 +00:00
Code Issues Projects Releases Wiki Activity

CI: Windows: try installing zlib

Browse Source
This commit is contained in:
gitlost
2025-09-16 11:04:36 +01:00
parent 5138d0703c
commit 55e89ae01f
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@@ -111,6 +111,10 @@ jobs:
shell: bash shell: bash
run: git config --global --add safe.directory ${GITHUB_WORKSPACE} && cmake -E make_directory build run: git config --global --add safe.directory ${GITHUB_WORKSPACE} && cmake -E make_directory build
- name: Install zlib
shell: bash
run: git clone https://github.com/madler/zlib.git zlib && cd zlib && nmake -f win32\Makefile.msc
- name: Configure CMake - name: Configure CMake
working-directory: build working-directory: build
shell: bash shell: bash

4
ChangeLog
View File

@@ -57,9 +57,7 @@ Changes
`GS1SYNTAXENGINE_MODE` (CLI --gs1strict, GUI "GS1 Strict" checkbox) `GS1SYNTAXENGINE_MODE` (CLI --gs1strict, GUI "GS1 Strict" checkbox)
- GS1_MODE: allow GS1 Digital Link URIs (no validation unless - GS1_MODE: allow GS1 Digital Link URIs (no validation unless
`GS1SYNTAXENGINE_MODE` set) `GS1SYNTAXENGINE_MODE` set)
- CLI: --gs1parens, --gs1nocheck and --gs1strict now imply --gs1; - CLI: --gs1parens, --gs1nocheck and --gs1strict now imply --gs1
--gs1parens no longer requires --esc if AI data includes backslashed
parentheses
Bugs Bugs
---- ----

10
backend_qt/qzint.cpp
View File

@@ -1362,16 +1362,16 @@ namespace Zint {
arg_bool(cmd, "--fullmultibyte", supportsFullMultibyte() && (option3() & 0xFF) == ZINT_FULL_MULTIBYTE); arg_bool(cmd, "--fullmultibyte", supportsFullMultibyte() && (option3() & 0xFF) == ZINT_FULL_MULTIBYTE);
if (supportsGS1()) { if (supportsGS1()) {
bool done_gs1 = false; bool gs1_implied = false;
if (gs1Parens() || (inputMode() & GS1PARENS_MODE)) { if (gs1Parens() || (inputMode() & GS1PARENS_MODE)) {
arg_bool(cmd, "--gs1parens", (done_gs1 = true)); arg_bool(cmd, "--gs1parens", (gs1_implied = true));
} }
if (gs1NoCheck() || (inputMode() & GS1NOCHECK_MODE)) { if (gs1NoCheck() || (inputMode() & GS1NOCHECK_MODE)) {
arg_bool(cmd, "--gs1nocheck", (done_gs1 = true)); arg_bool(cmd, "--gs1nocheck", (gs1_implied = true));
} else if (gs1SyntaxEngine() || (inputMode() & GS1SYNTAXENGINE_MODE)) { } else if (gs1SyntaxEngine() || (inputMode() & GS1SYNTAXENGINE_MODE)) {
arg_bool(cmd, "--gs1strict", (done_gs1 = true)); arg_bool(cmd, "--gs1strict", (gs1_implied = true));
} }
arg_bool(cmd, "--gs1", (inputMode() & 0x07) == GS1_MODE && !done_gs1); arg_bool(cmd, "--gs1", (inputMode() & 0x07) == GS1_MODE && !gs1_implied);
arg_bool(cmd, "--gssep", gsSep()); arg_bool(cmd, "--gssep", gsSep());
} }

4
docs/manual.html
View File

@@ -2582,8 +2582,8 @@ Modes and ECI</a> below.</p>
<p>GS1 data can be encoded in a number of symbologies. Application <p>GS1 data can be encoded in a number of symbologies. Application
Identifiers (AIs) should be enclosed in <code>[square brackets]</code> Identifiers (AIs) should be enclosed in <code>[square brackets]</code>
followed by the data to be encoded (see <a href="#gs1-128">6.1.10.3 followed by the data to be encoded (see <a href="#gs1-128">6.1.10.3
GS1-128</a>). For matrix symbologies, GS1 Digital Link URIs are also GS1-128</a>). For matrix symbologies, GS1 Digital Link URIs can also be
supported. To encode GS1 data use the <code>--gs1</code> option. given. To encode GS1 data use the <code>--gs1</code> option.
Alternatively, use the <code>--gs1strict</code> option, which strictly Alternatively, use the <code>--gs1strict</code> option, which strictly
verifies the GS1 data.</p> verifies the GS1 data.</p>
<p>GS1 mode is assumed (and doesn’t need to be set) for GS1-128, EAN-14, <p>GS1 mode is assumed (and doesn’t need to be set) for GS1-128, EAN-14,

2
docs/manual.pmd
View File

@@ -1281,7 +1281,7 @@ Interpretations) mechanism to encode the data if the symbology supports it - see
GS1 data can be encoded in a number of symbologies. Application Identifiers GS1 data can be encoded in a number of symbologies. Application Identifiers
(AIs) should be enclosed in `[square brackets]` followed by the data to be (AIs) should be enclosed in `[square brackets]` followed by the data to be
encoded (see [6.1.10.3 GS1-128]). For matrix symbologies, GS1 Digital Link URIs encoded (see [6.1.10.3 GS1-128]). For matrix symbologies, GS1 Digital Link URIs
are also supported. To encode GS1 data use the `--gs1` option. Alternatively, can also be given. To encode GS1 data use the `--gs1` option. Alternatively,
use the `--gs1strict` option, which strictly verifies the GS1 data. use the `--gs1strict` option, which strictly verifies the GS1 data.
GS1 mode is assumed (and doesn't need to be set) for GS1-128, EAN-14, GS1 GS1 mode is assumed (and doesn't need to be set) for GS1-128, EAN-14, GS1

4
docs/manual.txt
View File

@@ -1353,8 +1353,8 @@ Interpretations) mechanism to encode the data if the symbology supports it - see
GS1 data can be encoded in a number of symbologies. Application Identifiers GS1 data can be encoded in a number of symbologies. Application Identifiers
(AIs) should be enclosed in [square brackets] followed by the data to be encoded (AIs) should be enclosed in [square brackets] followed by the data to be encoded
(see 6.1.10.3 GS1-128). For matrix symbologies, GS1 Digital Link URIs are also (see 6.1.10.3 GS1-128). For matrix symbologies, GS1 Digital Link URIs can also
supported. To encode GS1 data use the --gs1 option. Alternatively, use the be given. To encode GS1 data use the --gs1 option. Alternatively, use the
--gs1strict option, which strictly verifies the GS1 data. --gs1strict option, which strictly verifies the GS1 data.
GS1 mode is assumed (and doesn’t need to be set) for GS1-128, EAN-14, GS1 GS1 mode is assumed (and doesn’t need to be set) for GS1-128, EAN-14, GS1