From 55e89ae01f54a3b82311efd968b3b89c84c0e8b4 Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 16 Sep 2025 11:04:36 +0100 Subject: [PATCH] CI: Windows: try installing zlib --- .github/workflows/ci.yml | 4 ++++ ChangeLog | 4 +--- backend_qt/qzint.cpp | 10 +++++----- docs/manual.html | 4 ++-- docs/manual.pmd | 2 +- docs/manual.txt | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7405513f..4a4029ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,6 +111,10 @@ jobs: shell: bash 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 working-directory: build shell: bash diff --git a/ChangeLog b/ChangeLog index 13bc5541..29a2a944 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,9 +57,7 @@ Changes `GS1SYNTAXENGINE_MODE` (CLI --gs1strict, GUI "GS1 Strict" checkbox) - GS1_MODE: allow GS1 Digital Link URIs (no validation unless `GS1SYNTAXENGINE_MODE` set) -- CLI: --gs1parens, --gs1nocheck and --gs1strict now imply --gs1; - --gs1parens no longer requires --esc if AI data includes backslashed - parentheses +- CLI: --gs1parens, --gs1nocheck and --gs1strict now imply --gs1 Bugs ---- diff --git a/backend_qt/qzint.cpp b/backend_qt/qzint.cpp index 913f2686..7f3d9e57 100644 --- a/backend_qt/qzint.cpp +++ b/backend_qt/qzint.cpp @@ -1362,16 +1362,16 @@ namespace Zint { arg_bool(cmd, "--fullmultibyte", supportsFullMultibyte() && (option3() & 0xFF) == ZINT_FULL_MULTIBYTE); if (supportsGS1()) { - bool done_gs1 = false; + bool gs1_implied = false; if (gs1Parens() || (inputMode() & GS1PARENS_MODE)) { - arg_bool(cmd, "--gs1parens", (done_gs1 = true)); + arg_bool(cmd, "--gs1parens", (gs1_implied = true)); } 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)) { - 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()); } diff --git a/docs/manual.html b/docs/manual.html index 13505c2d..b37a8d01 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -2582,8 +2582,8 @@ Modes and ECI below.

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 (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. +GS1-128). For matrix symbologies, GS1 Digital Link URIs can also be +given. To encode GS1 data use the --gs1 option. Alternatively, 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, diff --git a/docs/manual.pmd b/docs/manual.pmd index 3633f206..29c1ce38 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -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 (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 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. GS1 mode is assumed (and doesn't need to be set) for GS1-128, EAN-14, GS1 diff --git a/docs/manual.txt b/docs/manual.txt index f8338eaa..adfce623 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -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 (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 -supported. To encode GS1 data use the --gs1 option. Alternatively, use the +(see 6.1.10.3 GS1-128). For matrix symbologies, GS1 Digital Link URIs can also +be given. To encode GS1 data use the --gs1 option. Alternatively, 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