zint: add as a git submodule and add ZXING_USE_BUNDLED_ZINT cmake option

It is currently not automatically build in the default configuration and
not part of any ci build.

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        ref: ${{github.ref}}
+        submodules: true
 
     - name: Build the swift package
       run: swift build

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "zint"]
+	path = zint
+	url = https://github.com/zint/zint.git
+	shallow = true

CMakeLists.txt

@@ -11,6 +11,7 @@ option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production buil
 option (BUILD_PYTHON_MODULE "Build the python module" OFF)
 option (BUILD_C_API "Build the C-API" OFF)
 option (BUILD_EXPERIMENTAL_API "Build with experimental API" OFF)
+option (ZXING_USE_BUNDLED_ZINT "Use the bundled libzint for barcode creation/generation" ON)
 set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
 
 if (WIN32)

Package.swift

@@ -15,6 +15,7 @@ let package = Package(
         .target(
             name: "ZXingCppCore",
             path: "core/src",
+            exclude: ["libzint"],
             publicHeadersPath: "."
         ),
         .target(

core/CMakeLists.txt

@@ -511,9 +511,22 @@ target_compile_features(ZXing PUBLIC cxx_std_17)
 target_link_libraries (ZXing PRIVATE Threads::Threads)
 
 if (BUILD_WRITERS_NEW)
+    if (ZXING_USE_BUNDLED_ZINT)
+        aux_source_directory(src/libzint LIBZINT_FILES) # manually re-run cmake after adding a new file/symlink
+        add_library(bundled_zint STATIC EXCLUDE_FROM_ALL ${LIBZINT_FILES})
+        target_include_directories (bundled_zint
+            PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/libzint>"
+        )
+        target_compile_options (bundled_zint
+            PUBLIC ${ZXING_PUBLIC_FLAGS}
+            PRIVATE ${ZXING_PRIVATE_FLAGS}
+        )
+        target_link_libraries (ZXing PRIVATE bundled_zint)
+    else()
         include(../zxing.cmake)
         zxing_add_package(zint zint https://github.com/zint/zint.git 55a7369cd8c4a6b58bcd62f02a3a2d486952c897)
         target_link_libraries (ZXing PRIVATE zint)
+    endif()
 endif()
 
 add_library(ZXing::ZXing ALIAS ZXing)
@@ -564,6 +577,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
         src/qrcode/QRMaskUtil.cpp
         src/qrcode/QRReader.cpp
         src/qrcode/QRVersion.cpp
+        ${LIBZINT_FILES}
         PROPERTIES SKIP_PRECOMPILE_HEADERS ON COMPILE_FLAGS -Os)
     endif()
 endif()

core/src/libzint/2of5.c

@@ -0,0 +1 @@
+../../../zint/backend/2of5.c

core/src/libzint/aztec.c

@@ -0,0 +1 @@
+../../../zint/backend/aztec.c

core/src/libzint/aztec.h

@@ -0,0 +1 @@
+../../../zint/backend/aztec.h

core/src/libzint/big5.h

@@ -0,0 +1 @@
+../../../zint/backend/big5.h

core/src/libzint/channel_precalcs.h

@@ -0,0 +1 @@
+../../../zint/backend/channel_precalcs.h

core/src/libzint/code.c

@@ -0,0 +1 @@
+../../../zint/backend/code.c

core/src/libzint/code128.c

@@ -0,0 +1 @@
+../../../zint/backend/code128.c

core/src/libzint/code128.h

@@ -0,0 +1 @@
+../../../zint/backend/code128.h

core/src/libzint/common.c

@@ -0,0 +1 @@
+../../../zint/backend/common.c

core/src/libzint/common.h

@@ -0,0 +1 @@
+../../../zint/backend/common.h

core/src/libzint/dmatrix.c

@@ -0,0 +1 @@
+../../../zint/backend/dmatrix.c

core/src/libzint/dmatrix.h

@@ -0,0 +1 @@
+../../../zint/backend/dmatrix.h

core/src/libzint/dmatrix_trace.h

@@ -0,0 +1 @@
+../../../zint/backend/dmatrix_trace.h

core/src/libzint/eci.c

@@ -0,0 +1 @@
+../../../zint/backend/eci.c

core/src/libzint/eci.h

@@ -0,0 +1 @@
+../../../zint/backend/eci.h

core/src/libzint/eci_sb.h

@@ -0,0 +1 @@
+../../../zint/backend/eci_sb.h

core/src/libzint/filemem.c

@@ -0,0 +1 @@
+../../../zint/backend/filemem.c

core/src/libzint/filemem.h

@@ -0,0 +1 @@
+../../../zint/backend/filemem.h

core/src/libzint/fonts/normal_woff2.h

@@ -0,0 +1 @@
+../../../../zint/backend/fonts/normal_woff2.h

core/src/libzint/fonts/upcean_woff2.h

@@ -0,0 +1 @@
+../../../../zint/backend/fonts/upcean_woff2.h

core/src/libzint/gb18030.h

@@ -0,0 +1 @@
+../../../zint/backend/gb18030.h

core/src/libzint/gb2312.h

@@ -0,0 +1 @@
+../../../zint/backend/gb2312.h

core/src/libzint/gbk.h

@@ -0,0 +1 @@
+../../../zint/backend/gbk.h

core/src/libzint/general_field.c

@@ -0,0 +1 @@
+../../../zint/backend/general_field.c

core/src/libzint/general_field.h

@@ -0,0 +1 @@
+../../../zint/backend/general_field.h

core/src/libzint/gs1.c

@@ -0,0 +1 @@
+../../../zint/backend/gs1.c

core/src/libzint/gs1.h

@@ -0,0 +1 @@
+../../../zint/backend/gs1.h

core/src/libzint/gs1_lint.h

@@ -0,0 +1 @@
+../../../zint/backend/gs1_lint.h

core/src/libzint/iso3166.h

@@ -0,0 +1 @@
+../../../zint/backend/iso3166.h

core/src/libzint/iso4217.h

@@ -0,0 +1 @@
+../../../zint/backend/iso4217.h

core/src/libzint/ksx1001.h

@@ -0,0 +1 @@
+../../../zint/backend/ksx1001.h

core/src/libzint/large.c

@@ -0,0 +1 @@
+../../../zint/backend/large.c

core/src/libzint/large.h

@@ -0,0 +1 @@
+../../../zint/backend/large.h

core/src/libzint/library.c

@@ -0,0 +1 @@
+../../../zint/backend/library.c

core/src/libzint/maxicode.c

@@ -0,0 +1 @@
+../../../zint/backend/maxicode.c

core/src/libzint/maxicode.h

@@ -0,0 +1 @@
+../../../zint/backend/maxicode.h

core/src/libzint/medical.c

@@ -0,0 +1 @@
+../../../zint/backend/medical.c

core/src/libzint/output.c

@@ -0,0 +1 @@
+../../../zint/backend/output.c

core/src/libzint/output.h

@@ -0,0 +1 @@
+../../../zint/backend/output.h

core/src/libzint/pdf417.c

@@ -0,0 +1 @@
+../../../zint/backend/pdf417.c

core/src/libzint/pdf417.h

@@ -0,0 +1 @@
+../../../zint/backend/pdf417.h

core/src/libzint/pdf417_tabs.h

@@ -0,0 +1 @@
+../../../zint/backend/pdf417_tabs.h

core/src/libzint/pdf417_trace.h

@@ -0,0 +1 @@
+../../../zint/backend/pdf417_trace.h

core/src/libzint/qr.c

@@ -0,0 +1 @@
+../../../zint/backend/qr.c

core/src/libzint/qr.h

@@ -0,0 +1 @@
+../../../zint/backend/qr.h

core/src/libzint/raster.c

@@ -0,0 +1 @@
+../../../zint/backend/raster.c

core/src/libzint/raster_font.h

@@ -0,0 +1 @@
+../../../zint/backend/raster_font.h

core/src/libzint/reedsol.c

@@ -0,0 +1 @@
+../../../zint/backend/reedsol.c

core/src/libzint/reedsol.h

@@ -0,0 +1 @@
+../../../zint/backend/reedsol.h

core/src/libzint/reedsol_logs.h

@@ -0,0 +1 @@
+../../../zint/backend/reedsol_logs.h

core/src/libzint/rss.c

@@ -0,0 +1 @@
+../../../zint/backend/rss.c

core/src/libzint/rss.h

@@ -0,0 +1 @@
+../../../zint/backend/rss.h

core/src/libzint/sjis.h

@@ -0,0 +1 @@
+../../../zint/backend/sjis.h

core/src/libzint/stubs.c

@@ -0,0 +1,92 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+#include "common.h"
+
+#define STUB_PIXEL_PLOT(NAME) \
+	INTERNAL int NAME(struct zint_symbol* symbol, const unsigned char* pixelbuf) \
+	{ \
+		(void)symbol; \
+		(void)pixelbuf; \
+		return ZINT_ERROR_ENCODING_PROBLEM; \
+	}
+
+#define STUB_FUNC_CHAR(NAME) \
+	INTERNAL int NAME(struct zint_symbol* symbol, unsigned char source[], int length) \
+	{ \
+		(void)symbol; \
+		(void)source; \
+		(void)length; \
+		return ZINT_ERROR_ENCODING_PROBLEM; \
+	}
+
+#define STUB_FUNC_SEGS(NAME) \
+	INTERNAL int NAME(struct zint_symbol* symbol, struct zint_seg segs[], const int seg_count) \
+	{ \
+		(void)symbol; \
+		(void)segs; \
+		(void)seg_count; \
+		return ZINT_ERROR_ENCODING_PROBLEM; \
+	}
+
+STUB_PIXEL_PLOT(png_pixel_plot)
+STUB_PIXEL_PLOT(bmp_pixel_plot)
+STUB_PIXEL_PLOT(pcx_pixel_plot)
+STUB_PIXEL_PLOT(gif_pixel_plot)
+STUB_PIXEL_PLOT(tif_pixel_plot)
+
+INTERNAL int ps_plot(struct zint_symbol* symbol)
+{
+	(void)symbol;
+	return ZINT_ERROR_ENCODING_PROBLEM;
+}
+INTERNAL int emf_plot(struct zint_symbol* symbol, int rotate_angle)
+{
+	(void)symbol;
+	(void)rotate_angle;
+	return ZINT_ERROR_ENCODING_PROBLEM;
+}
+
+// STUB_FUNC_CHAR(pzn)
+// STUB_FUNC_CHAR(c25ind)
+// STUB_FUNC_CHAR(c25iata)
+// STUB_FUNC_CHAR(c25inter)
+// STUB_FUNC_CHAR(c25logic)
+// STUB_FUNC_CHAR(itf14)
+// STUB_FUNC_CHAR(dpleit)
+// STUB_FUNC_CHAR(dpident)
+// STUB_FUNC_CHAR(code11)
+STUB_FUNC_CHAR(msi_plessey)
+STUB_FUNC_CHAR(telepen)
+STUB_FUNC_CHAR(telepen_num)
+STUB_FUNC_CHAR(plessey)
+// STUB_FUNC_CHAR(pharma)
+STUB_FUNC_CHAR(flat)
+STUB_FUNC_CHAR(fim)
+// STUB_FUNC_CHAR(pharma_two)
+STUB_FUNC_CHAR(postnet)
+STUB_FUNC_CHAR(planet)
+STUB_FUNC_CHAR(usps_imail)
+STUB_FUNC_CHAR(rm4scc)
+STUB_FUNC_CHAR(auspost)
+STUB_FUNC_CHAR(code16k)
+STUB_FUNC_CHAR(composite)
+STUB_FUNC_CHAR(kix)
+// STUB_FUNC_CHAR(code32)
+STUB_FUNC_CHAR(daft)
+// STUB_FUNC_CHAR(nve18)
+STUB_FUNC_CHAR(koreapost)
+STUB_FUNC_CHAR(japanpost)
+STUB_FUNC_CHAR(code49)
+// STUB_FUNC_CHAR(channel)
+STUB_FUNC_SEGS(codeone)
+STUB_FUNC_SEGS(gridmatrix)
+STUB_FUNC_SEGS(hanxin)
+STUB_FUNC_SEGS(dotcode)
+STUB_FUNC_SEGS(codablockf)
+// STUB_FUNC_CHAR(vin)
+STUB_FUNC_CHAR(mailmark_2d)
+STUB_FUNC_CHAR(mailmark_4s)
+// STUB_FUNC_CHAR(upu_s10)
+STUB_FUNC_SEGS(ultra)
+// STUB_FUNC_CHAR(dpd)
+STUB_FUNC_CHAR(bc412)

core/src/libzint/svg.c

@@ -0,0 +1 @@
+../../../zint/backend/svg.c

core/src/libzint/upcean.c

@@ -0,0 +1 @@
+../../../zint/backend/upcean.c

core/src/libzint/vector.c

@@ -0,0 +1 @@
+../../../zint/backend/vector.c

core/src/libzint/zfiletypes.h

@@ -0,0 +1 @@
+../../../zint/backend/zfiletypes.h

core/src/libzint/zint.h

@@ -0,0 +1 @@
+../../../zint/backend/zint.h

core/src/libzint/zintconfig.h

@@ -0,0 +1 @@
+../../../zint/backend/zintconfig.h

wrappers/rust/Cargo.toml

@@ -12,6 +12,7 @@ categories = ["api-bindings", "computer-vision"]
 exclude = [
     "core/**/*Write*",
     "core/**/*Encode*",
+    "core/src/libzint/**",
 ]
 
 [lib]

zxing-cpp.podspec

@@ -24,6 +24,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'core/src/**/*.{h,c,cpp}'
+    ss.exclude_files = [ 'core/src/libzint/**' ]
     ss.private_header_files = 'core/src/**/*.h'
   end