zxing-cpp 3.0.0__tar.gz → 3.1.0rc1__tar.gz

zxing_cpp-3.1.0rc1/.gitignore

@@ -0,0 +1,68 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Sphinx documentation
+docs/_build/
+docs/source/api
+
+# PyBuilder
+target/
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/

zxing_cpp-3.1.0rc1/CMakeLists.txt

@@ -0,0 +1,93 @@
+cmake_minimum_required(VERSION 3.18)
+project(ZXingPython)
+
+# check if we are called from the top-level ZXing project
+get_directory_property(hasParent PARENT_DIRECTORY)
+if (NOT hasParent)
+    # TODO: replace with symlinks once https://github.com/scikit-build/scikit-build-core/issues/801 is resolved
+    message(STATUS "Copying files from parent folder needed for sdist")
+    foreach(NAME zxing.cmake LICENSE)
+        if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}")
+            execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${CMAKE_CURRENT_SOURCE_DIR}/../../${NAME}"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}"
+                )
+        endif()
+    endforeach()
+
+    set(CMAKE_CXX_STANDARD 20) # required here for the module itself
+
+    option (BUILD_SHARED_LIBS "Link python module to shared lib" OFF)
+    option (ZXING_READERS "Build with reader support (decoders)" ON)
+    set    (ZXING_WRITERS "NEW" CACHE STRING "Build with old and/or new writer (encoder) backend (OFF/ON/OLD/NEW)")
+    set    (ZXING_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
+    option (ZXING_EXPERIMENTAL_API "Build with experimental API" ON)
+
+    set(CORE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/core)
+    if(IS_SYMLINK ${CORE_PATH})
+        # This is needed because otherwise GCC resolves the symlink which causes paths to randomly
+        # be prefixed by /core or by /wrappers/python/core depending on include order.
+        set(CORE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../core)
+    endif()
+
+    if(EXISTS ${CORE_PATH})
+        add_subdirectory(${CORE_PATH} ZXing EXCLUDE_FROM_ALL)
+        include(${CMAKE_CURRENT_SOURCE_DIR}/zxing.cmake)
+    else()
+        message(FATAL_ERROR "Unable to locate zxing source code")
+    endif()
+endif()
+
+# Try to import all Python components potentially needed by nanobind
+find_package(Python 3.10
+    REQUIRED COMPONENTS Interpreter Development.Module
+    OPTIONAL_COMPONENTS Development.SABIModule)
+zxing_add_package(nanobind nanobind https://github.com/wjakob/nanobind.git v2.11.0)
+
+nanobind_add_module(zxingcpp STABLE_ABI FREE_THREADED zxing.cpp)
+target_link_libraries(zxingcpp PRIVATE ZXing::ZXing)
+
+# Copy ZXing.dll alongside zxingcpp.pyd to solve ImportError during stub generation
+if (WIN32 AND BUILD_SHARED_LIBS)
+    add_custom_command(TARGET zxingcpp POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                $<TARGET_FILE:ZXing::ZXing>
+                $<TARGET_FILE_DIR:zxingcpp>
+        VERBATIM
+    )
+endif()
+
+nanobind_add_stub(
+    zxingcpp_stub
+    MODULE zxingcpp
+    OUTPUT zxingcpp.pyi
+    PYTHON_PATH $<TARGET_FILE_DIR:zxingcpp>
+    DEPENDS zxingcpp
+)
+
+if (ZXING_READERS AND ZXING_WRITERS)
+    add_test(NAME PythonTest COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test.py -v)
+    set_property(TEST PythonTest PROPERTY ENVIRONMENT PYTHONPATH=$<TARGET_FILE_DIR:zxingcpp>)
+endif()
+
+# Default package install directory ("zxingcpp"), enables 'import zxingcpp'
+if (NOT DEFINED ZXING_PYTHON_INSTALL_LIBDIR)
+    set(ZXING_PYTHON_INSTALL_LIBDIR "zxingcpp")
+endif()
+
+# Create py.typed marker file for type checking
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/py.typed" "")
+
+install(TARGETS zxingcpp
+    COMPONENT python
+    LIBRARY DESTINATION "${ZXING_PYTHON_INSTALL_LIBDIR}")
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/init.py
+    COMPONENT python
+    RENAME __init__.py
+    DESTINATION "${ZXING_PYTHON_INSTALL_LIBDIR}")
+install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/zxingcpp.pyi
+        ${CMAKE_CURRENT_BINARY_DIR}/py.typed
+    COMPONENT python
+    DESTINATION "${ZXING_PYTHON_INSTALL_LIBDIR}")
+

{zxing_cpp-3.0.0/zxing_cpp.egg-info → zxing_cpp-3.1.0rc1}/PKG-INFO

@@ -1,43 +1,37 @@
 Metadata-Version: 2.4
 Name: zxing-cpp
-Version: 3.0.0
+Version: 3.1.0rc1
 Summary: Python bindings for the zxing-cpp barcode library
-Author-email: zxing-cpp community <zxingcpp@gmail.com>
-License-Expression: Apache-2.0
-Project-URL: Homepage, https://github.com/zxing-cpp/zxing-cpp
-Project-URL: Repository, https://github.com/zxing-cpp/zxing-cpp.git
-Project-URL: Issues, https://github.com/zxing-cpp/zxing-cpp/issues
 Keywords: barcode
+Author-Email: zxing-cpp community <zxingcpp@gmail.com>
+License-Expression: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Multimedia :: Graphics
+Project-URL: Homepage, https://github.com/zxing-cpp/zxing-cpp
+Project-URL: Repository, https://github.com/zxing-cpp/zxing-cpp.git
+Project-URL: Issues, https://github.com/zxing-cpp/zxing-cpp/issues
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Dynamic: license-file
 
 # Python bindings for zxing-cpp
 
 [![PyPI](https://img.shields.io/pypi/v/zxing-cpp.svg)](https://pypi.org/project/zxing-cpp/)
 
+The package uses [scikit-build-core](https://scikit-build-core.readthedocs.io/) as its build backend and [nanobind](https://nanobind.readthedocs.io/) for the Python bindings.
 
 ## Installation
 
 ```bash
 pip install zxing-cpp
 ```
-or
-
-```bash
-python setup.py install
-```
 
-In case there is no pre-build wheel available for your platform or python version or if you use `setup.py` directly, a suitable [build environment](https://github.com/zxing-cpp/zxing-cpp#build-instructions) including a c++20 compiler is required. To build from source, you can call:
+To build from a checked out / extracted soruce tree, a suitable [build environment](https://github.com/zxing-cpp/zxing-cpp#build-instructions) including a C++20 compiler is required:
 
 ```bash
-pip install zxing-cpp --no-binary zxing-cpp
+pip install .
 ```
 
 
@@ -76,4 +70,4 @@ with open("test.svg", "w") as svg_file:
 	svg_file.write(svg)
 ```
 
-To get a full list of available parameters for `read_barcodes` and `create_barcode` as well as the properties of the Barcode objects, have a look at the `PYBIND11_MODULE` definition in [this c++ source file](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/python/zxing.cpp).
+To get a full list of available parameters for `read_barcodes` and `create_barcode` as well as the properties of the Barcode objects, have a look at the `nanobind` module definition in [this C++ source file](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/python/zxing.cpp).

{zxing_cpp-3.0.0 → zxing_cpp-3.1.0rc1}/README.md

@@ -2,22 +2,18 @@
 
 [![PyPI](https://img.shields.io/pypi/v/zxing-cpp.svg)](https://pypi.org/project/zxing-cpp/)
 
+The package uses [scikit-build-core](https://scikit-build-core.readthedocs.io/) as its build backend and [nanobind](https://nanobind.readthedocs.io/) for the Python bindings.
 
 ## Installation
 
 ```bash
 pip install zxing-cpp
 ```
-or
 
-```bash
-python setup.py install
-```
-
-In case there is no pre-build wheel available for your platform or python version or if you use `setup.py` directly, a suitable [build environment](https://github.com/zxing-cpp/zxing-cpp#build-instructions) including a c++20 compiler is required. To build from source, you can call:
+To build from a checked out / extracted soruce tree, a suitable [build environment](https://github.com/zxing-cpp/zxing-cpp#build-instructions) including a C++20 compiler is required:
 
 ```bash
-pip install zxing-cpp --no-binary zxing-cpp
+pip install .
 ```
 
 
@@ -56,4 +52,4 @@ with open("test.svg", "w") as svg_file:
 	svg_file.write(svg)
 ```
 
-To get a full list of available parameters for `read_barcodes` and `create_barcode` as well as the properties of the Barcode objects, have a look at the `PYBIND11_MODULE` definition in [this c++ source file](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/python/zxing.cpp).
+To get a full list of available parameters for `read_barcodes` and `create_barcode` as well as the properties of the Barcode objects, have a look at the `nanobind` module definition in [this C++ source file](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/python/zxing.cpp).

{zxing_cpp-3.0.0 → zxing_cpp-3.1.0rc1}/core/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
-project (ZXing VERSION "3.0.0")
-set (ZXING_VERSION_SUFFIX "")
+project (ZXing VERSION "3.1.0")
+set (ZXING_VERSION_SUFFIX "-rc1")
 set (ZXING_SONAME 4) # see https://github.com/zxing-cpp/zxing-cpp/issues/333
 
 option (ZXING_USE_BUNDLED_ZINT "Use the bundled libzint for barcode creation/writing" ON)
@@ -81,7 +81,7 @@ if(HAS_FILE_PREFIX_ARG)
     list (APPEND ZXING_PRIVATE_FLAGS "${FILE_PREFIX_ARG}")
 endif()
 
-################# Source files
+# MARK: - COMMON_FILES
 
 set (COMMON_FILES
     src/Barcode.h
@@ -120,6 +120,8 @@ set (COMMON_FILES
     src/ReaderOptions.h
     src/ReadBarcode.h
     src/ReadBarcode.cpp
+    src/ReedSolomon.h
+    src/ReedSolomon.cpp
     src/SymbologyIdentifier.h
     src/Utf.h
     src/Utf.cpp
@@ -131,6 +133,7 @@ set (COMMON_FILES
     src/ZXAlgorithms.h
     src/ZXConfig.h
     src/ZXTestSupport.h
+    src/ZXVersion.h
     $<$<BOOL:${ZXING_C_API}>:src/ZXingC.h>
     $<$<BOOL:${ZXING_C_API}>:src/ZXingC.cpp>
 )
@@ -138,10 +141,6 @@ if (ZXING_READERS OR ZXING_WRITERS_OLD)
     set (COMMON_FILES ${COMMON_FILES}
         src/BitArray.h
         src/BitArray.cpp
-        src/GenericGF.h
-        src/GenericGF.cpp
-        src/GenericGFPoly.h
-        src/GenericGFPoly.cpp
     )
 endif()
 if (ZXING_READERS OR ZXING_WRITERS_NEW)
@@ -164,6 +163,8 @@ if (ZXING_READERS)
         src/GridSampler.h
         src/GridSampler.cpp
         src/LogMatrix.h
+        src/LocalGrid.h
+        src/LocalGrid.cpp
         src/HybridBinarizer.h
         src/HybridBinarizer.cpp
         src/MultiFormatReader.h
@@ -172,8 +173,6 @@ if (ZXING_READERS)
         src/PerspectiveTransform.h
         src/PerspectiveTransform.cpp
         src/Reader.h
-        src/ReedSolomonDecoder.h
-        src/ReedSolomonDecoder.cpp
         src/RegressionLine.h
         src/ResultPoint.h
         src/ResultPoint.cpp
@@ -199,13 +198,13 @@ endif()
 
 if (ZXING_WRITERS_OLD)
     set (COMMON_FILES ${COMMON_FILES}
-        src/ReedSolomonEncoder.h
-        src/ReedSolomonEncoder.cpp
         src/MultiFormatWriter.h
         src/MultiFormatWriter.cpp
     )
 endif()
 
+# MARK: - PUBLIC_HEADERS
+
 # define subset of public headers that get distributed with the binaries
 set (PUBLIC_HEADERS
     src/Barcode.h
@@ -222,6 +221,7 @@ set (PUBLIC_HEADERS
     src/ReaderOptions.h
     src/WriteBarcode.h
     src/ZXingCpp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ZXVersion.h # deprecated, but keep it for now to not break old clients
     ${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingQt.h
     $<$<BOOL:${ZXING_C_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingC.h>
 )
@@ -239,6 +239,8 @@ if (ZXING_WRITERS_OLD)
 endif()
 # end of public header set
 
+# MARK: - READERS/WRITERS
+
 if (ZXING_READERS AND ZXING_ENABLE_AZTEC)
     set (AZTEC_FILES ${AZTEC_FILES}
         src/aztec/AZDecoder.h
@@ -319,7 +321,6 @@ if ((ZXING_READERS OR ZXING_WRITERS_OLD) AND ZXING_ENABLE_1D)
         src/oned/ODUPCEANCommon.cpp
         src/oned/ODCode93Patterns.h
         src/oned/ODCode128Patterns.h
-        src/oned/ODCode128Patterns.cpp
     )
 endif()
 if (ZXING_READERS AND ZXING_ENABLE_1D)
@@ -346,6 +347,8 @@ if (ZXING_READERS AND ZXING_ENABLE_1D)
         src/oned/ODDXFilmEdgeReader.cpp
         src/oned/ODITFReader.h
         src/oned/ODITFReader.cpp
+        src/oned/ODTelepenReader.h
+        src/oned/ODTelepenReader.cpp
         src/oned/ODMultiUPCEANReader.h
         src/oned/ODMultiUPCEANReader.cpp
         src/oned/ODReader.h
@@ -404,15 +407,13 @@ if (ZXING_READERS AND ZXING_ENABLE_PDF417)
         src/pdf417/PDFDetectionResultColumn.cpp
         src/pdf417/PDFDetector.h
         src/pdf417/PDFDetector.cpp
-        src/pdf417/PDFModulusGF.h
-        src/pdf417/PDFModulusGF.cpp
-        src/pdf417/PDFModulusPoly.h
-        src/pdf417/PDFModulusPoly.cpp
         src/pdf417/PDFReader.h
         src/pdf417/PDFReader.cpp
         src/pdf417/PDFScanningDecoder.h
         src/pdf417/PDFScanningDecoder.cpp
         src/pdf417/ZXNullable.h
+        src/pdf417/MicroPDFReader.h
+        src/pdf417/MicroPDFReader.cpp
     )
 endif()
 if (ZXING_WRITERS_OLD AND ZXING_ENABLE_PDF417)
@@ -478,6 +479,8 @@ source_group (Sources\\oned FILES ${ONED_FILES})
 source_group (Sources\\pdf417 FILES ${PDF417_FILES})
 source_group (Sources\\qrcode FILES ${QRCODE_FILES})
 
+# MARK: - Library target
+
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
@@ -517,8 +520,19 @@ if (ZXING_READERS OR ZXING_WRITERS_OLD)
     )
     target_sources(ZXing PRIVATE ${LIBZUECI_FILES})
     source_group (Sources\\libzueci FILES ${LIBZUECI_FILES})
+
+    set (LIBRSCPP_FILES
+        src/librscpp/field.h
+        src/librscpp/poly.h
+        src/librscpp/encode.h
+        src/librscpp/decode.h
+    )
+    target_sources(ZXing PRIVATE ${LIBRSCPP_FILES})
+    source_group (Sources\\librscpp FILES ${LIBRSCPP_FILES})
 endif()
 
+# MARK: - ZINT
+
 if (ZXING_WRITERS_NEW)
     if (ZXING_USE_BUNDLED_ZINT)
         set (LIBZINT_FILES
@@ -565,6 +579,7 @@ if (ZXING_WRITERS_NEW)
             list(APPEND LIBZINT_FILES
                 src/libzint/2of5inter.c
                 src/libzint/2of5inter_based.c
+                src/libzint/telepen.c
                 src/libzint/codabar.c
                 src/libzint/code128.c
                 src/libzint/code128.h
@@ -615,7 +630,7 @@ if (ZXING_WRITERS_NEW)
     else()
         include(../zxing.cmake)
         zxing_add_package(zint zint https://github.com/zint/zint.git 2.16.0)
-        target_link_libraries (ZXing PRIVATE $<IF:$<BOOL:${ZINT_STATIC}>,zint-static,zint>)
+        target_link_libraries (ZXing PRIVATE $<IF:$<BOOL:${ZINT_STATIC}>,zint::zint-static,zint::zint>)
     endif()
 endif()
 
@@ -633,13 +648,29 @@ if (PROJECT_VERSION)
     set_target_properties(ZXing PROPERTIES SOVERSION ${ZXING_SONAME})
 endif()
 
+# Add Windows resource file for version information
+if (WIN32 AND BUILD_SHARED_LIBS)
+    # Convert version to comma-separated format for Windows resources
+    string(REPLACE "." "," FILE_VERSION_COMMA "${PROJECT_VERSION}.0")
+    set(FILE_VERSION_STR "${PROJECT_VERSION}.0")
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in
+        ${CMAKE_CURRENT_BINARY_DIR}/version.rc
+        @ONLY
+    )
+    target_sources(ZXing PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+endif()
+
 # TODO: use FILE_SET HEADERS instead of PUBLIC_HEADER and target_sources, once CMake 3.23+ is required
 set_target_properties(ZXing PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
+# MARK: - Precompiled headers
+
 set(PRECOMPILE_HEADERS ${PUBLIC_HEADERS})
 list(REMOVE_ITEM PRECOMPILE_HEADERS
     "$<$<BOOL:${ZXING_C_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingC.h>"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingQt.h")
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingQt.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/ZXVersion.h")
 list(APPEND PRECOMPILE_HEADERS "src/BarcodeData.h" "src/Content.h" "src/Range.h")
 if (NOT ZXING_DISABLE_PCH)
     target_precompile_headers(ZXing PRIVATE ${PRECOMPILE_HEADERS})
@@ -681,6 +712,8 @@ if(CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo")
     endif()
 endif()
 
+# MARK: - Installation
+
 include (GNUInstallDirs)
 
 set(ZX_INSTALL_TARGETS ZXing)

{zxing_cpp-3.0.0 → zxing_cpp-3.1.0rc1}/core/ZXingConfig.cmake.in

@@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/ZXingTargets.cmake")
 
 # this does not work: add_library(ZXing::Core ALIAS ZXing::ZXing)
 # this is a workaround available since 3.11 :
-if(NOT(CMAKE_VERSION VERSION_LESS 3.11))
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.11 AND NOT TARGET ZXing::Core)
     add_library(ZXing::Core INTERFACE IMPORTED)
     target_link_libraries(ZXing::Core INTERFACE ZXing::ZXing)
 endif()

{zxing_cpp-3.0.0 → zxing_cpp-3.1.0rc1}/core/src/Barcode.cpp

@@ -69,7 +69,7 @@ std::string Barcode::text(TextMode mode) const
 
 std::string Barcode::text() const
 {
-	return text(d->readerOpts.textMode());
+	return text(d->defaultTextMode);
 }
 
 ContentType Barcode::contentType() const
@@ -126,7 +126,7 @@ Barcode& Barcode::setReaderOptions(const ReaderOptions& opts)
 {
 	if (opts.characterSet() != CharacterSet::Unknown)
 		d->content.defaultCharset = opts.characterSet();
-	d->readerOpts = opts;
+	d->defaultTextMode = opts.textMode();
 	return *this;
 }
 
@@ -151,7 +151,7 @@ std::string Barcode::extra(std::string_view key) const
 		auto res =
 			StrCat("{", JsonProp("Text", text(TextMode::Plain)), JsonProp("HRI", text(TextMode::HRI)),
 				   JsonProp("TextECI", text(TextMode::ECI)), JsonProp("Bytes", text(TextMode::Hex)),
-				   JsonProp("Identifier", symbologyIdentifier()), JsonProp("Type", Name(format())),
+				   JsonProp("Identifier", symbologyIdentifier()), JsonProp("Format", Name(format())),
 				   JsonProp("Symbology", Name(Symbology(format()))), JsonProp("ContentType", isValid() ? ToString(contentType()) : ""),
 				   JsonProp("Position", ToString(position())), JsonProp("HasECI", hasECI()), JsonProp("IsMirrored", isMirrored()),
 				   JsonProp("IsInverted", isInverted()), d->extra, JsonProp("Error", ToString(error())));
@@ -175,10 +175,11 @@ bool BarcodeData::operator==(const BarcodeData& o) const
 
 	// handle MatrixCodes first
 	if (!(format & BarcodeFormat::AllLinear)) {
-		if (isValid() && o.isValid() && content.bytes != o.content.bytes)
+		if (content.bytes != o.content.bytes)
 			return false;
 
-		// check for equal position if both are valid with equal bytes or at least one is in error
+		// At this point both are valid with the same content or both are in error.
+		// Treat them as equal if their positions are about the same (center of one is inside the other).
 		return IsInside(Center(o.position), position);
 	}