pFad - Phonifier reborn

From a8ad5ccc8fd50cad8bf115442235cf860562b245 Mon Sep 17 00:00:00 2001 From: axxel Date: Tue, 31 Dec 2024 12:49:26 +0100 Subject: [PATCH 001/104] CI: remove 32bit ARM part from publish job (fix regression) --- .github/workflows/publish-winrt.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/publish-winrt.yml b/.github/workflows/publish-winrt.yml index 41e38f94ce..880ad39a69 100644 --- a/.github/workflows/publish-winrt.yml +++ b/.github/workflows/publish-winrt.yml @@ -55,9 +55,6 @@ jobs: - uses: actions/download-artifact@v4 with: name: winrt-x64-artifacts - - uses: actions/download-artifact@v4 - with: - name: winrt-ARM-artifacts - uses: actions/download-artifact@v4 with: name: winrt-ARM64-artifacts From 0bb732b8bc747bc398647b6a3eb4597e623a219f Mon Sep 17 00:00:00 2001 From: axxel Date: Tue, 31 Dec 2024 15:59:13 +0100 Subject: [PATCH 002/104] Version: add ZXing::Version()/ZXing_Version() functions for runtime access See also #881. --- core/src/ZXingC.cpp | 10 ++++++++-- core/src/ZXingC.h | 2 ++ core/src/ZXingCpp.cpp | 16 ++++++++++++---- core/src/ZXingCpp.h | 10 ++++++---- wrappers/c/ZXingCTest.c | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/core/src/ZXingC.cpp b/core/src/ZXingC.cpp index d5b8833a2b..3327abe6a8 100644 --- a/core/src/ZXingC.cpp +++ b/core/src/ZXingC.cpp @@ -7,12 +7,12 @@ #include "ZXingC.h" #include "ZXingCpp.h" +#include "Version.h" #include #include #include #include -#include #include using namespace ZXing; @@ -411,9 +411,15 @@ char* ZXing_LastErrorMsg() return copy(std::exchange(lastErrorMsg, {})); } +const char* ZXing_Version() +{ + return ZXING_VERSION_STR; +} + void ZXing_free(void* ptr) { - free(ptr); + if (ptr != ZXing_Version()) + free(ptr); } } // extern "C" diff --git a/core/src/ZXingC.h b/core/src/ZXingC.h index 2a5a279a02..282f528574 100644 --- a/core/src/ZXingC.h +++ b/core/src/ZXingC.h @@ -312,6 +312,8 @@ ZXing_Image* ZXing_WriteBarcodeToImage(const ZXing_Barcode* barcode, const ZXing /* ZXing_LastErrorMsg() returns NULL in case there is no last error and a copy of the string otherwise. */ char* ZXing_LastErrorMsg(); +const char* ZXing_Version(); + void ZXing_free(void* ptr); #ifdef __cplusplus diff --git a/core/src/ZXingCpp.cpp b/core/src/ZXingCpp.cpp index 28b2870ab4..782c5fc842 100644 --- a/core/src/ZXingCpp.cpp +++ b/core/src/ZXingCpp.cpp @@ -3,12 +3,20 @@ */ // SPDX-License-Identifier: Apache-2.0 -#ifdef ZXING_EXPERIMENTAL_API - #include "ZXingCpp.h" +#include "Version.h" + namespace ZXing { +const std::string& Version() +{ + static std::string res = ZXING_VERSION_STR; + return res; +} + +#ifdef ZXING_EXPERIMENTAL_API + BarcodeFormats SupportedBarcodeFormats(Operation op) { switch (op) { @@ -31,6 +39,6 @@ BarcodeFormats SupportedBarcodeFormats(Operation op) return {}; // unreachable code } -} // namespace ZXing - #endif // ZXING_EXPERIMENTAL_API + +} // namespace ZXing diff --git a/core/src/ZXingCpp.h b/core/src/ZXingCpp.h index 254d3d53cf..dd115823e0 100644 --- a/core/src/ZXingCpp.h +++ b/core/src/ZXingCpp.h @@ -9,10 +9,12 @@ #include "ReadBarcode.h" #include "WriteBarcode.h" -#ifdef ZXING_EXPERIMENTAL_API - namespace ZXing { +const std::string& Version(); + +#ifdef ZXING_EXPERIMENTAL_API + enum class Operation { Create, @@ -23,6 +25,6 @@ enum class Operation BarcodeFormats SupportedBarcodeFormats(Operation op = Operation::CreateOrRead); -} // namespace ZXing - #endif // ZXING_EXPERIMENTAL_API + +} // namespace ZXing diff --git a/wrappers/c/ZXingCTest.c b/wrappers/c/ZXingCTest.c index 6896523ad1..161c6dd5a1 100644 --- a/wrappers/c/ZXingCTest.c +++ b/wrappers/c/ZXingCTest.c @@ -16,7 +16,7 @@ int usage(char* pname) { - fprintf(stderr, "Usage: %s FILE [FORMATS]\n", pname); + fprintf(stderr, "ZXingCTest %s, usage: %s FILE [FORMATS]\n", ZXing_Version(), pname); return 1; } From 5a7ae447e0edadaa192181d40664c3e513820fa6 Mon Sep 17 00:00:00 2001 From: axxel Date: Tue, 31 Dec 2024 17:42:48 +0100 Subject: [PATCH 003/104] ci: fix Swift package build regression --- Package.swift | 2 +- core/src/ZXingC.cpp | 5 +++++ core/src/ZXingCpp.cpp | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b514af7cd4..5faf571d10 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( .target( name: "ZXingCppCore", path: "core/src", - exclude: ["libzint"], + exclude: ["libzint", "ZXingC.cpp", "ZXingCpp.cpp"], publicHeadersPath: ".", cxxSettings: [ .define("ZXING_READERS") diff --git a/core/src/ZXingC.cpp b/core/src/ZXingC.cpp index 3327abe6a8..9f2d342ecf 100644 --- a/core/src/ZXingC.cpp +++ b/core/src/ZXingC.cpp @@ -7,7 +7,12 @@ #include "ZXingC.h" #include "ZXingCpp.h" + +#if __has_include("Version.h") #include "Version.h" +#else // this is mainly a workaround for a missing autogenerated Version.h in the XCode/CocoaPods corner +#define ZXING_VERSION_STR "undefined" +#endif #include #include diff --git a/core/src/ZXingCpp.cpp b/core/src/ZXingCpp.cpp index 782c5fc842..d5fa34609b 100644 --- a/core/src/ZXingCpp.cpp +++ b/core/src/ZXingCpp.cpp @@ -5,7 +5,11 @@ #include "ZXingCpp.h" +#if __has_include("Version.h") #include "Version.h" +#else // this is mainly a workaround for a missing autogenerated Version.h in the XCode/CocoaPods corner +#define ZXING_VERSION_STR "undefined" +#endif namespace ZXing { From b9c62cc58589e9273fea9877f38ad76683f1662c Mon Sep 17 00:00:00 2001 From: axxel Date: Wed, 1 Jan 2025 14:48:38 +0100 Subject: [PATCH 004/104] zint: update auto-fetch URL to include DXFilmEdge support (latest rev) I thought to use the latest release 2.13.0 instead but that lacks support for in memory file generation which is crucial to our use case. --- core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 658abfc5a0..fb19617bb8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -536,7 +536,7 @@ if (ZXING_WRITERS_NEW) target_include_directories (ZXing PRIVATE "$") else() include(../zxing.cmake) - zxing_add_package(zint zint https://github.com/zint/zint.git 55a7369cd8c4a6b58bcd62f02a3a2d486952c897) + zxing_add_package(zint zint https://github.com/zint/zint.git 7a9fdd6cd00cd5bfd0082705d934c13ef84f25e1) target_link_libraries (ZXing PRIVATE zint) endif() endif() From d6068bcebeb8fd9f0d35a99b00d202be86a14dbe Mon Sep 17 00:00:00 2001 From: axxel Date: Wed, 1 Jan 2025 22:30:28 +0100 Subject: [PATCH 005/104] README: mention the `ZXING_WRITERS=NEW` build option --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90eb314f39..112324a1da 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Thanks a lot for your contribution! [Note:] * DataBar used to be called RSS. - * DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing. + * DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing (unless the library is configured `ZXING_WRITERS=NEW` and `ZING_EXPERIMENTAL_API=ON`). * Building with only C++17 (see [CMakeLists.txt](https://github.com/zxing-cpp/zxing-cpp/blob/d4b0f502775857f257d13efd25fb840ece1bca3e/CMakeLists.txt#L45)) changes the behavior of the library: it then lacks support for DataBarLimited and multi-symbol and position independent detection for DataMatrix. ## Getting Started @@ -86,7 +86,7 @@ To see the full capability of the API, have a look at [`ZXingReader.cpp`](exampl 2. Call `encode()` with text content and the image size. This returns a [`BitMatrix`](core/src/BitMatrix.h) which is a binary image of the barcode where `true` == visual black and `false` == visual white. 3. Convert the bit matrix to your native image format. See also the `ToMatrix(BitMatrix&)` helper function. -As an example, have a look at [`ZXingWriter.cpp`](example/ZXingWriter.cpp). +As an example, have a look at [`ZXingWriter.cpp`](example/ZXingWriter.cpp). That file also contains example code showing the new `ZXING_EXPERIMENTAL_API` for writing barcodes. ## Web Demos - [Read barcodes](https://zxing-cpp.github.io/zxing-cpp/demo_reader.html) From d71b83b20490000fe7634e7f562364b67dcd3876 Mon Sep 17 00:00:00 2001 From: axxel Date: Thu, 2 Jan 2025 09:52:32 +0100 Subject: [PATCH 006/104] CI: Update ZXingWinRT.nuspec (remove 32bit ARM) --- wrappers/winrt/nuget/ZXingWinRT.nuspec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wrappers/winrt/nuget/ZXingWinRT.nuspec b/wrappers/winrt/nuget/ZXingWinRT.nuspec index f6b61e8bf6..8115e9e936 100644 --- a/wrappers/winrt/nuget/ZXingWinRT.nuspec +++ b/wrappers/winrt/nuget/ZXingWinRT.nuspec @@ -15,8 +15,6 @@ zxing barcode scanner qrcode - - @@ -26,4 +24,4 @@ - \ No newline at end of file + From 746ef5139cd2b027f66c22f8aafc65c44d0f41b0 Mon Sep 17 00:00:00 2001 From: axxel Date: Thu, 2 Jan 2025 10:00:29 +0100 Subject: [PATCH 007/104] CI: Update ZXingWinRT.nuspec (remove 32bit ARM, for real...) no comment... :-/ --- wrappers/winrt/nuget/ZXingWinRT.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrappers/winrt/nuget/ZXingWinRT.nuspec b/wrappers/winrt/nuget/ZXingWinRT.nuspec index 8115e9e936..a98207f7a4 100644 --- a/wrappers/winrt/nuget/ZXingWinRT.nuspec +++ b/wrappers/winrt/nuget/ZXingWinRT.nuspec @@ -15,7 +15,7 @@ zxing barcode scanner qrcode - + From 8f95431dfad9890c34680bff1b7f69989e69d9fa Mon Sep 17 00:00:00 2001 From: axxel Date: Sat, 4 Jan 2025 02:03:36 +0100 Subject: [PATCH 008/104] C-API: correct wrong statement about default inclusion of the feature --- wrappers/c/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrappers/c/README.md b/wrappers/c/README.md index aa0d8c1a94..4381483d26 100644 --- a/wrappers/c/README.md +++ b/wrappers/c/README.md @@ -1,10 +1,10 @@ # C bindings for zxing-cpp -This is a preview/proposal for a C-API to zxing-cpp. If you have any comments or feedback, please have a look at https://github.com/zxing-cpp/zxing-cpp/discussions/583. +This is about the C-API of zxing-cpp. If you have any comments or feedback, please have a look at https://github.com/zxing-cpp/zxing-cpp/discussions/583. ## Installation -It is currently included in the default build to be trivially accessible for everyone. +To enable the C-API, the library needs to be configured with `cmake -DZING_C_API=ON`. Probably the easiest way to play with the C-API is to just modify the [ZXingCTest.c](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/c/ZXingCTest.c) file. From 63702f33b2e21c92c2b089fc6f5d9e92d70e74b5 Mon Sep 17 00:00:00 2001 From: axxel Date: Sat, 4 Jan 2025 20:51:09 +0100 Subject: [PATCH 009/104] dotnet: target netstandard2.0 and net5.0 This fixes #884. --- wrappers/dotnet/ZXingCpp/ZXingCpp.cs | 13 +++++++++++++ wrappers/dotnet/ZXingCpp/ZXingCpp.csproj | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/wrappers/dotnet/ZXingCpp/ZXingCpp.cs b/wrappers/dotnet/ZXingCpp/ZXingCpp.cs index 90eae5fed2..4b2b277890 100644 --- a/wrappers/dotnet/ZXingCpp/ZXingCpp.cs +++ b/wrappers/dotnet/ZXingCpp/ZXingCpp.cs @@ -6,6 +6,9 @@ namespace ZXingCpp { using System; +#if NETSTANDARD +using System.Text; +#endif using System.Runtime.InteropServices; using System.Collections.Generic; @@ -125,7 +128,17 @@ public static IntPtr CheckError(IntPtr ptr, string? msg = null) public static string MarshalAsString(IntPtr ptr) { ptr = CheckError(ptr, "ZXing C-API returned a NULL char*."); +#if NET string res = Marshal.PtrToStringUTF8(ptr) ?? ""; +#else + string res; + unsafe + { + int length = 0; + for (byte* i = (byte*)ptr; *i != 0; i++, length++); + res = Encoding.UTF8.GetString((byte*)ptr, length); + } +#endif ZXing_free(ptr); return res; } diff --git a/wrappers/dotnet/ZXingCpp/ZXingCpp.csproj b/wrappers/dotnet/ZXingCpp/ZXingCpp.csproj index 3db7fdd2a9..e80a7b80de 100644 --- a/wrappers/dotnet/ZXingCpp/ZXingCpp.csproj +++ b/wrappers/dotnet/ZXingCpp/ZXingCpp.csproj @@ -1,12 +1,14 @@ - netstandard2.1 + netstandard2.0;net5.0 + 9 + true enable ZXingCpp - 0.3.0-alpha + 0.4.0-alpha Axel Waggershauser zxing-cpp From 82806f5f92173b8cb4e1e9bee13a2d07a33fb69f Mon Sep 17 00:00:00 2001 From: axxel Date: Sun, 5 Jan 2025 23:41:29 +0100 Subject: [PATCH 010/104] c++: fix improper use of NDEBUG Thanks to Antonio Rojas for pointing it out to me. --- core/src/HybridBinarizer.cpp | 12 ++++++------ core/src/oned/ODDataBarCommon.h | 2 +- test/unit/datamatrix/DMEncodeDecodeTest.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/HybridBinarizer.cpp b/core/src/HybridBinarizer.cpp index 33562817a0..8f8a6f90cc 100644 --- a/core/src/HybridBinarizer.cpp +++ b/core/src/HybridBinarizer.cpp @@ -143,7 +143,7 @@ static std::shared_ptr CalculateMatrix(const uint8_t* __restrict lumi { auto matrix = std::make_shared(width, height); -#ifndef NDEBUG +#ifdef PRINT_DEBUG Matrix out(width, height); Matrix out2(width, height); #endif @@ -163,7 +163,7 @@ static std::shared_ptr CalculateMatrix(const uint8_t* __restrict lumi int average = sum / 25; ThresholdBlock(luminances, xoffset, yoffset, average, rowStride, *matrix); -#ifndef NDEBUG +#ifdef PRINT_DEBUG for (int yy = 0; yy < 8; ++yy) for (int xx = 0; xx < 8; ++xx) { out.set(xoffset + xx, yoffset + yy, blackPoints(x, y)); @@ -173,7 +173,7 @@ static std::shared_ptr CalculateMatrix(const uint8_t* __restrict lumi } } -#ifndef NDEBUG +#ifdef PRINT_DEBUG std::ofstream file("thresholds.pnm"); file << "P5\n" << out.width() << ' ' << out.height() << "\n255\n"; file.write(reinterpret_cast(out.data()), out.size()); @@ -260,7 +260,7 @@ static std::shared_ptr ThresholdImage(const ImageView iv, const Matri { auto matrix = std::make_shared(iv.width(), iv.height()); -#ifndef NDEBUG +#ifdef PRINT_DEBUG Matrix out(iv.width(), iv.height()); #endif @@ -270,7 +270,7 @@ static std::shared_ptr ThresholdImage(const ImageView iv, const Matri int xoffset = std::min(x * BLOCK_SIZE, iv.width() - BLOCK_SIZE); ThresholdBlock(iv.data(), xoffset, yoffset, thresholds(x, y), iv.rowStride(), *matrix); -#ifndef NDEBUG +#ifdef PRINT_DEBUG for (int yy = 0; yy < 8; ++yy) for (int xx = 0; xx < 8; ++xx) out.set(xoffset + xx, yoffset + yy, thresholds(x, y)); @@ -278,7 +278,7 @@ static std::shared_ptr ThresholdImage(const ImageView iv, const Matri } } -#ifndef NDEBUG +#ifdef PRINT_DEBUG std::ofstream file("thresholds_new.pnm"); file << "P5\n" << out.width() << ' ' << out.height() << "\n255\n"; file.write(reinterpret_cast(out.data()), out.size()); diff --git a/core/src/oned/ODDataBarCommon.h b/core/src/oned/ODDataBarCommon.h index cb937ebb17..88330ab580 100644 --- a/core/src/oned/ODDataBarCommon.h +++ b/core/src/oned/ODDataBarCommon.h @@ -37,7 +37,7 @@ inline bool IsFinder(int a, int b, int c, int d, int e) // (c < 5 + 10 * e) && (a < 2 + 4 * e) && (4 * a > n); -#if !defined(NDEBUG) && 0 +#if defined(PRINT_DEBUG) && 0 printf("["); for (bool v : {w + 5 > 9 * n, diff --git a/test/unit/datamatrix/DMEncodeDecodeTest.cpp b/test/unit/datamatrix/DMEncodeDecodeTest.cpp index 33f1587740..84238109eb 100644 --- a/test/unit/datamatrix/DMEncodeDecodeTest.cpp +++ b/test/unit/datamatrix/DMEncodeDecodeTest.cpp @@ -21,7 +21,7 @@ namespace { ASSERT_EQ(matrix.empty(), false); DecoderResult res = DataMatrix::Decode(matrix); -#ifndef NDEBUG +#ifdef PRINT_DEBUG if (!res.isValid() || data != res.text()) SaveAsPBM(matrix, "failed-datamatrix.pbm", 4); #endif From dff7da1ee4ac72343b9e74570352c381f093e9e1 Mon Sep 17 00:00:00 2001 From: axxel Date: Tue, 7 Jan 2025 01:30:44 +0100 Subject: [PATCH 011/104] python: re-enable test_write_read_cycle_numpy on Windows With the current version 19.42.34435.0, it seems to work again. This 'fixes' #735. --- wrappers/python/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrappers/python/test.py b/wrappers/python/test.py index f3d1282a79..655669ccb9 100644 --- a/wrappers/python/test.py +++ b/wrappers/python/test.py @@ -120,7 +120,7 @@ def test_write_read_cycle_buffer(self): self.check_res(zxingcpp.read_barcode(img), format, text) - @unittest.skipIf(not has_numpy or platform.system() == "Windows", "need numpy for read/write tests") + @unittest.skipIf(not has_numpy, "need numpy for read/write tests") def test_write_read_cycle_numpy(self): import numpy as np format = BF.QRCode From 149c40aa42dcdf43246b43ff282a2825c5c0541b Mon Sep 17 00:00:00 2001 From: Christian Schmitz Date: Fri, 10 Jan 2025 16:28:11 +0100 Subject: [PATCH 012/104] Changed thread_local to ZX_THREAD_LOCAL (#889) Change `thread_local` to `ZX_THREAD_LOCAL` so it can be disabled centrally (as it used to). --- core/src/GlobalHistogramBinarizer.cpp | 5 +++-- core/src/ZXConfig.h | 1 + core/src/ZXingC.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/GlobalHistogramBinarizer.cpp b/core/src/GlobalHistogramBinarizer.cpp index fb0b3ec26e..2777bb2283 100644 --- a/core/src/GlobalHistogramBinarizer.cpp +++ b/core/src/GlobalHistogramBinarizer.cpp @@ -8,6 +8,7 @@ #include "BitMatrix.h" #include "Pattern.h" +#include "ZXConfig.h" #include #include @@ -115,7 +116,7 @@ bool GlobalHistogramBinarizer::getPatternRow(int row, int rotation, PatternRow& // during the histogram calculation and during the sharpen+threshold operation. Additionally, if we // perform the ThresholdSharpened function on pixStride==1 data, the auto-vectorizer makes that part // 8x faster on an AVX2 cpu which easily recovers the extra cost that we pay for the copying. - thread_local std::vector line; + ZX_THREAD_LOCAL std::vector line; if (std::abs(buffer.pixStride()) > 4) { line.resize(lineView.size()); std::copy(lineView.begin(), lineView.end(), line.begin()); @@ -127,7 +128,7 @@ bool GlobalHistogramBinarizer::getPatternRow(int row, int rotation, PatternRow& if (threshold <= 0) return false; - thread_local std::vector binarized; + ZX_THREAD_LOCAL std::vector binarized; // the optimizer can generate a specialized version for pixStride==1 (non-rotated input) that is about 8x faster on AVX2 hardware if (lineView.begin().stride == 1) ThresholdSharpened(lineView, threshold, binarized); diff --git a/core/src/ZXConfig.h b/core/src/ZXConfig.h index d00d3df942..9190a1062e 100644 --- a/core/src/ZXConfig.h +++ b/core/src/ZXConfig.h @@ -9,6 +9,7 @@ // in e.g. the ReedSolomonDecoder. It is disabled by default. It can be enabled by modifying the following define. // Note: The Apple clang compiler until XCode 8 does not support c++11's thread_local. // The alternative 'static' makes the code thread unsafe. +// for Windows in Visual Studio 2019 on Intel 64-bit using thread_local causes a dependency to VCRUNTIME140_1.dll, so you need 2019 runtime DLLs instead of only 2015 version. #define ZX_THREAD_LOCAL thread_local // '' (nothing), 'thread_local' or 'static' // The Galoir Field abstractions used in Reed-Solomon error correction code can use more memory to eliminate a modulo diff --git a/core/src/ZXingC.cpp b/core/src/ZXingC.cpp index 9f2d342ecf..c502e2c639 100644 --- a/core/src/ZXingC.cpp +++ b/core/src/ZXingC.cpp @@ -7,6 +7,7 @@ #include "ZXingC.h" #include "ZXingCpp.h" +#include "ZXConfig.h" #if __has_include("Version.h") #include "Version.h" @@ -22,7 +23,7 @@ using namespace ZXing; -static thread_local std::string lastErrorMsg; +static ZX_THREAD_LOCAL std::string lastErrorMsg; static Barcodes emptyBarcodes{}; // used to prevent new heap allocation for each empty result template R transmute_cast(const T& v) noexcept From 7be9048e8176fba4f6ffa3dcf528282c6b0151a9 Mon Sep 17 00:00:00 2001 From: axxel Date: Fri, 17 Jan 2025 08:53:40 +0100 Subject: [PATCH 013/104] README: fix typos `ZING` -> `ZXING`, fixes #891 --- README.md | 2 +- wrappers/c/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 112324a1da..0145bcda94 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Thanks a lot for your contribution! [Note:] * DataBar used to be called RSS. - * DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing (unless the library is configured `ZXING_WRITERS=NEW` and `ZING_EXPERIMENTAL_API=ON`). + * DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing (unless the library is configured `ZXING_WRITERS=NEW` and `ZXING_EXPERIMENTAL_API=ON`). * Building with only C++17 (see [CMakeLists.txt](https://github.com/zxing-cpp/zxing-cpp/blob/d4b0f502775857f257d13efd25fb840ece1bca3e/CMakeLists.txt#L45)) changes the behavior of the library: it then lacks support for DataBarLimited and multi-symbol and position independent detection for DataMatrix. ## Getting Started diff --git a/wrappers/c/README.md b/wrappers/c/README.md index 4381483d26..5de23e40bc 100644 --- a/wrappers/c/README.md +++ b/wrappers/c/README.md @@ -4,7 +4,7 @@ This is about the C-API of zxing-cpp. If you have any comments or feedback, plea ## Installation -To enable the C-API, the library needs to be configured with `cmake -DZING_C_API=ON`. +To enable the C-API, the library needs to be configured with `cmake -DZXING_C_API=ON`. Probably the easiest way to play with the C-API is to just modify the [ZXingCTest.c](https://github.com/zxing-cpp/zxing-cpp/blob/master/wrappers/c/ZXingCTest.c) file. From a920817b6fe0508cc4aca9003003c2812a78e935 Mon Sep 17 00:00:00 2001 From: axxel Date: Fri, 31 Jan 2025 10:25:53 +0100 Subject: [PATCH 014/104] QRDetector: require the central FP square to be at least 3 pixels This is considered a fix for #888. --- core/src/qrcode/QRDetector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/qrcode/QRDetector.cpp b/core/src/qrcode/QRDetector.cpp index 37476843bc..1d9e7350de 100644 --- a/core/src/qrcode/QRDetector.cpp +++ b/core/src/qrcode/QRDetector.cpp @@ -43,7 +43,7 @@ PatternView FindPattern(const PatternView& view) { return FindLeftGuard(view, PATTERN.size(), [](const PatternView& view, int spaceInPixel) { // perform a fast plausability test for 1:1:3:1:1 pattern - if (view[2] < 2 * std::max(view[0], view[4]) || view[2] < std::max(view[1], view[3])) + if (view[2] < 3 || view[2] < 2 * std::max(view[0], view[4]) || view[2] < std::max(view[1], view[3])) return 0.; return IsPattern(view, PATTERN, spaceInPixel, 0.1); // the requires 4, here we accept almost 0 }); From 1ef992f9492af01027a58077957ecce23c8b7ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 13 Feb 2025 08:01:52 +0100 Subject: [PATCH 015/104] [Python] Support using system CMake (#902) Add `cmake` PyPI dependency only if the program is not found, and use the system version instead. This avoids unnecessary dependencies on third-party binary packages, and improves portability by using downstream-patched CMake version. --- wrappers/python/pyproject.toml | 1 - wrappers/python/setup.py | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/wrappers/python/pyproject.toml b/wrappers/python/pyproject.toml index 16484fe3ee..367d8e85f9 100644 --- a/wrappers/python/pyproject.toml +++ b/wrappers/python/pyproject.toml @@ -3,7 +3,6 @@ requires = [ "setuptools>=42", "setuptools_scm", "wheel", - "cmake>=3.15", "pybind11[global]", ] build-backend = "setuptools.build_meta" diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py index d98aab2266..811dbbf8f2 100644 --- a/wrappers/python/setup.py +++ b/wrappers/python/setup.py @@ -1,3 +1,4 @@ +import json import os import platform import subprocess @@ -42,6 +43,20 @@ def build_extension(self, ext): subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp) +def get_setup_requires(): + try: + subp = subprocess.run(['cmake', '-E', 'capabilities'], stdout=subprocess.PIPE) + except OSError: + pass + else: + if subp.returncode == 0: + version = json.loads(subp.stdout).get('version', {}) + version_split = (version.get('major', 0), version.get('minor', 0)) + if version_split >= (3, 15): + return [] + return ['cmake>=3.15'] + + with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() @@ -76,6 +91,7 @@ def build_extension(self, ext): "Topic :: Multimedia :: Graphics", ], python_requires=">=3.6", + setup_requires=get_setup_requires(), ext_modules=[CMakeExtension('zxingcpp')], cmdclass=dict(build_ext=CMakeBuild), zip_safe=False, From 225e24f44b11a38797778927a4b2fdece5f03ecb Mon Sep 17 00:00:00 2001 From: axxel Date: Wed, 19 Feb 2025 23:28:12 +0100 Subject: [PATCH 016/104] publish-android: add comment on how to 'release' after publication --- .github/workflows/publish-android.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml index afb3be26c4..24ab171b60 100644 --- a/.github/workflows/publish-android.yml +++ b/.github/workflows/publish-android.yml @@ -35,3 +35,6 @@ jobs: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }} run: ./gradlew publishReleasePublicationToSonatypeRepository + + +# To actually publish the the blob, login to https://s01.oss.sonatype.org/#stagingRepositories, then press "Close", then "Release". From dde0548a7e0f0c48545553f6fdd60bbd7a7e3dc1 Mon Sep 17 00:00:00 2001 From: axxel Date: Wed, 19 Feb 2025 23:29:01 +0100 Subject: [PATCH 017/104] README: update current Sponsor infos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0145bcda94..9dc75d7f5b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/ax Named Sponsors: * [KURZ Digital Solutions GmbH & Co. KG](https://github.com/kurzdigital) * [Useful Sensors Inc](https://github.com/usefulsensors) -* [EUREKAM](https://eurekam.fr/) +* [synedra](https://synedra.com/) Thanks a lot for your contribution! From 37b847798a1af55d3a289a9516a751fcafae3c23 Mon Sep 17 00:00:00 2001 From: axxel Date: Wed, 19 Feb 2025 23:38:41 +0100 Subject: [PATCH 018/104] android: switch SNAPSHOT version to 2.4.0 and update README See #897 and #833. --- wrappers/android/README.md | 4 ++-- wrappers/android/zxingcpp/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wrappers/android/README.md b/wrappers/android/README.md index 0e10bb804d..f3a3ef1acd 100644 --- a/wrappers/android/README.md +++ b/wrappers/android/README.md @@ -4,8 +4,8 @@ The easiest way to use the library is to fetch if from _mavenCentral_. Simply add **one** of the following two lines ```gradle -implementation("io.github.zxing-cpp:android:2.2.0") -implementation("io.github.zxing-cpp:android:2.3.0-SNAPSHOT") +implementation("io.github.zxing-cpp:android:2.3.0") +implementation("io.github.zxing-cpp:android:2.4.0-SNAPSHOT") ``` to your `build.gradle.kts` file in the `dependencies` section. To access the SNAPSHOT version, you also need to add a separate repositories entry in your `build.cradle.kts` file: diff --git a/wrappers/android/zxingcpp/build.gradle.kts b/wrappers/android/zxingcpp/build.gradle.kts index 8cdb1d46c8..0a71d48006 100644 --- a/wrappers/android/zxingcpp/build.gradle.kts +++ b/wrappers/android/zxingcpp/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { val publishSnapshot: String? by project group = "io.github.zxing-cpp" -version = "2.3.0" + if (publishSnapshot == "true") "-SNAPSHOT" else "" +version = "2.4.0" + if (publishSnapshot == "true") "-SNAPSHOT" else "" val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") From b46534d9bca0ce1832ee192c80e7395b999341b7 Mon Sep 17 00:00:00 2001 From: axxel Date: Thu, 20 Mar 2025 10:20:56 +0100 Subject: [PATCH 019/104] QRCode: improve detection rate for circular finder patterns Those are actually invalid according to the spec but quite popular. This is related to #910 and also #892, the latter still does not scan, though. --- core/src/ConcentricFinder.cpp | 10 ++++++++-- core/src/ConcentricFinder.h | 2 ++ core/src/qrcode/QRDetector.cpp | 6 ++++-- test/blackbox/BlackboxTestRunner.cpp | 10 +++++----- test/samples/qrcode-2/qr-circles-1.png | Bin 0 -> 1700 bytes test/samples/qrcode-2/qr-circles-1.txt | 1 + 6 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 test/samples/qrcode-2/qr-circles-1.png create mode 100644 test/samples/qrcode-2/qr-circles-1.txt diff --git a/core/src/ConcentricFinder.cpp b/core/src/ConcentricFinder.cpp index e21f65e664..e43dd38b79 100644 --- a/core/src/ConcentricFinder.cpp +++ b/core/src/ConcentricFinder.cpp @@ -156,8 +156,14 @@ static std::vector CollectRingPoints(const BitMatrix& image, PointF cent static std::optional FitQadrilateralToPoints(PointF center, std::vector& points) { auto dist2Center = [c = center](auto a, auto b) { return distance(a, c) < distance(b, c); }; + auto [minDistElem, maxDistElem] = std::minmax_element(points.begin(), points.end(), dist2Center); + + // check if points are on a circle: for a square the min/max ratio is 0.7, for a circle it is 1 + if (distance(center, *minDistElem) / distance(center, *maxDistElem) > 0.85) + return {}; + // rotate points such that the first one is the furthest away from the center (hence, a corner) - std::rotate(points.begin(), std::max_element(points.begin(), points.end(), dist2Center), points.end()); + std::rotate(points.begin(), maxDistElem, points.end()); std::array corners; corners[0] = &points[0]; @@ -207,7 +213,7 @@ static bool QuadrilateralIsPlausibleSquare(const QuadrilateralF q, int lineIndex return m >= lineIndex * 2 && m > M / 3; } -static std::optional FitSquareToPoints(const BitMatrix& image, PointF center, int range, int lineIndex, bool backup) +std::optional FitSquareToPoints(const BitMatrix& image, PointF center, int range, int lineIndex, bool backup) { auto points = CollectRingPoints(image, center, range, lineIndex, backup); if (points.empty()) diff --git a/core/src/ConcentricFinder.h b/core/src/ConcentricFinder.h index 68f29b6d45..f8490e0c21 100644 --- a/core/src/ConcentricFinder.h +++ b/core/src/ConcentricFinder.h @@ -101,6 +101,8 @@ std::optional CenterOfRing(const BitMatrix& image, PointI center, int ra std::optional FinetuneConcentricPatternCenter(const BitMatrix& image, PointF center, int range, int finderPatternSize); +std::optional FitSquareToPoints(const BitMatrix& image, PointF center, int range, int lineIndex, bool backup); + std::optional FindConcentricPatternCorners(const BitMatrix& image, PointF center, int range, int ringIndex); struct ConcentricPattern : public PointF diff --git a/core/src/qrcode/QRDetector.cpp b/core/src/qrcode/QRDetector.cpp index 1d9e7350de..728a7db520 100644 --- a/core/src/qrcode/QRDetector.cpp +++ b/core/src/qrcode/QRDetector.cpp @@ -385,7 +385,7 @@ DetectorResult SampleQR(const BitMatrix& image, const FinderPatternSet& fp) } // otherwise the simple estimation used by upstream is used as a best guess fallback - if (!image.isIn(br)) { + if (!image.isIn(br) || !FitSquareToPoints(image, fp.bl, fp.bl.size, 2, false)) { br = fp.tr - fp.tl + fp.bl; brOffset = PointF(0, 0); } @@ -404,7 +404,9 @@ DetectorResult SampleQR(const BitMatrix& image, const FinderPatternSet& fp) dimension = version->dimension(); mod2Pix = Mod2Pix(dimension, brOffset, {fp.tl, fp.tr, br, fp.bl}); } -#if 1 + +#if 1 // finding and evaluating the alignment patterns to enable a tiled sampling of the symbol + auto& apM = version->alignmentPatternCenters(); // alignment pattern positions in modules auto apP = Matrix>(Size(apM), Size(apM)); // found/guessed alignment pattern positions in pixels const int N = Size(apM) - 1; diff --git a/test/blackbox/BlackboxTestRunner.cpp b/test/blackbox/BlackboxTestRunner.cpp index 94bd072750..45f7073166 100644 --- a/test/blackbox/BlackboxTestRunner.cpp +++ b/test/blackbox/BlackboxTestRunner.cpp @@ -579,11 +579,11 @@ int runBlackBoxTests(const fs::path& testPathPrefix, const std::set { 16, 16, 270 }, }); - runTests("qrcode-2", "QRCode", 51, { - { 45, 48, 0 }, - { 45, 48, 90 }, - { 45, 48, 180 }, - { 45, 48, 270 }, + runTests("qrcode-2", "QRCode", 52, { + { 46, 49, 0 }, + { 46, 49, 90 }, + { 46, 49, 180 }, + { 46, 49, 270 }, { 22, 1, pure }, // the misread is the 'outer' symbol in 16.png }); diff --git a/test/samples/qrcode-2/qr-circles-1.png b/test/samples/qrcode-2/qr-circles-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4a2ae9ee864148c2252bbbcd5fe0c959aa301115 GIT binary patch literal 1700 zcmV;V23z@wP)9glgM))rRaHPhKsY!!8X6h^004aJoudE%20=+gK~#9!?VP`l95ocjXZJ24 zbSD%E$}0{5-4+zkZlSH+t(#;;%IF z_>K3g(etyP{XF}Ij*gCwj*hn*i>vR~P*@4fi$bFS@I{*MS z?`PvaegSHL%e!1l%gyEB<9OcBr>A#MFNcr5yq+q5sU4(C>IqT@-rB4FJ-y!Io9Sm4 zG8WP$^#rK{ui%5JVScpuYE1Z9=7V%eJwfZts|I^p-fb}nj?@A33eLuaRYl_40rT$T zlO%pM?BeSr`eX2LJny&Di-}rp1`EgYF7vC(%Zk++aCpy?@cHCMej5Ls-1xmDeDoS0 zAopSm#9Qzn%~TiZ?$a^hyL7u)=MJm*LA@{Sm{%2ZlRGJ4m8GviVF(*f{WZ*ZI)Ft5=I7JOdQVi-Ozj~Wv`FV7r@ z_Jy=xWL{(Tls&WhKn3$U9^_Db0OAI=$6MFE=-}zV;pG*|gRC{*4w%0shyywyFV z%7RecN2@FdwOE46W}t&`JLpIFb4Gp5Co-~+4AV~P>t2!37|AflN`37wGMXncV7_Rt zgLpgW^TnLNXGtQ5-$)(ePkf#xa`=tZAqK~1iXw;KNL`+_)12YoJ>4=R0)J_PodhCNj59sMZmvyCxP8S@2j_DFmpZ>odS*+HKd z<~J8m9qw`8$#VhK;U4$iJQq+M?jinA%Jw=qy&d%ZLL}nPj-X%7^Cp$?S{Q8GJabbS z?+0LfTj!1d&I8UK(D4^i7mf^PAME%{sS8Jj6AN(G4O%Z(dmXg1gFYv` zjo`VS`HR=9--Xrb#Qt+=-(a85&jtw#FXqaXaAfG;%eY` z75-VF&H=n;Xs?5KJLumY%oEOk*;QUH&u*MJ8SJ0SWsMytRtPbKavAeSdmWtC4tfmX z-8pNZK6lTj{Ihqmd-sga|Nel+zH?65UI%ULpvMm86+dud&H9|%^WNEsx9f9m&+!B2 z%t4=X`}R6Gy&d#8;=2K|585|Uok3%S_Rdsi&^$r$1E@FDK^r^h-y_XCzcTf?nj5c^>_o9T;7m$Ub`X(YIV=xyI5-b-I5-b7pG_y2`%5dk9G}l;n0stL zzj7`Q-P>^nBfoOA4mb~TlpRFmR}RaA91hMp8V}B|%-@^&XVG4MW&Y;QKacnFEAw}U z{x=CmcH>|j@Ee5N0rx^M*b>{1#`ZH3pC|2=0&d5%GUxj#rGneBXX2bkrBpyW%!3@Q z1I~jSZ3nzc3qnMG<*+=+k?`^$>zq$ Date: Mon, 24 Mar 2025 09:47:15 +0000 Subject: [PATCH 020/104] AZDecoder: add flag `haveFNC1` and only erase `` if set. Fixes #916 The first byte is lost when recognizing the Aztec code --- core/src/aztec/AZDecoder.cpp | 43 +++++++++++++++++-------------- test/unit/aztec/AZDecoderTest.cpp | 17 ++++++++++++ 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/core/src/aztec/AZDecoder.cpp b/core/src/aztec/AZDecoder.cpp index f38fbe3fef..46f96dda46 100644 --- a/core/src/aztec/AZDecoder.cpp +++ b/core/src/aztec/AZDecoder.cpp @@ -249,12 +249,13 @@ static StructuredAppendInfo ParseStructuredAppend(ByteArray& bytes) return sai; } -static void DecodeContent(const BitArray& bits, Content& res) +static void DecodeContent(const BitArray& bits, Content& res, bool &haveFNC1) { Table latchTable = Table::UPPER; // table most recently latched to Table shiftTable = Table::UPPER; // table to use for the next read auto remBits = BitArrayView(bits); + haveFNC1 = false; while (remBits.size() >= (shiftTable == Table::DIGIT ? 4 : 5)) { // see ISO/IEC 24778:2008 7.3.1.2 regarding padding bits if (shiftTable == Table::BINARY) { @@ -283,6 +284,7 @@ static void DecodeContent(const BitArray& bits, Content& res) } else if (std::strcmp(str, "FLGN") == 0) { int flg = remBits.readBits(3); if (flg == 0) { // FNC1 + haveFNC1 = true; res.push_back(29); // May be removed at end if first/second FNC1 } else if (flg <= 6) { // FLG(1) to FLG(6) ECI @@ -305,9 +307,10 @@ DecoderResult Decode(const BitArray& bits) { Content res; res.symbology = {'z', '0', 3}; + bool haveFNC1; try { - DecodeContent(bits, res); + DecodeContent(bits, res, haveFNC1); } catch (const std::exception&) { // see BitArrayView::readBits return FormatError(); } @@ -321,24 +324,24 @@ DecoderResult Decode(const BitArray& bits) StructuredAppendInfo sai = haveStructuredAppend ? ParseStructuredAppend(res.bytes) : StructuredAppendInfo(); - // As converting character set ECIs ourselves and ignoring/skipping non-character ECIs, not using - // modifiers that indicate ECI protocol (ISO/IEC 24778:2008 Annex F Table F.1) - if (res.bytes.size() > 1 && res.bytes[0] == 29) { - res.symbology.modifier = '1'; // GS1 - res.symbology.aiFlag = AIFlag::GS1; - res.erase(0, 1); // Remove FNC1 - } else if (res.bytes.size() > 2 && std::isupper(res.bytes[0]) && res.bytes[1] == 29) { - // FNC1 following single uppercase letter (the AIM Application Indicator) - res.symbology.modifier = '2'; // AIM - res.symbology.aiFlag = AIFlag::AIM; - res.erase(1, 1); // Remove FNC1, - // The AIM Application Indicator character "A"-"Z" is left in the stream (ISO/IEC 24778:2008 16.2) - } else if (res.bytes.size() > 3 && std::isdigit(res.bytes[0]) && std::isdigit(res.bytes[1]) && res.bytes[2] == 29) { - // FNC1 following 2 digits (the AIM Application Indicator) - res.symbology.modifier = '2'; // AIM - res.symbology.aiFlag = AIFlag::AIM; - res.erase(2, 1); // Remove FNC1 - // The AIM Application Indicator characters "00"-"99" are left in the stream (ISO/IEC 24778:2008 16.2) + if (haveFNC1) { + if (res.bytes[0] == 29) { + res.symbology.modifier = '1'; // GS1 + res.symbology.aiFlag = AIFlag::GS1; + res.erase(0, 1); // Remove FNC1 + } else if (res.bytes.size() > 2 && std::isupper(res.bytes[0]) && res.bytes[1] == 29) { + // FNC1 following single uppercase letter (the AIM Application Indicator) + res.symbology.modifier = '2'; // AIM + res.symbology.aiFlag = AIFlag::AIM; + res.erase(1, 1); // Remove FNC1, + // The AIM Application Indicator character "A"-"Z" is left in the stream (ISO/IEC 24778:2008 16.2) + } else if (res.bytes.size() > 3 && std::isdigit(res.bytes[0]) && std::isdigit(res.bytes[1]) && res.bytes[2] == 29) { + // FNC1 following 2 digits (the AIM Application Indicator) + res.symbology.modifier = '2'; // AIM + res.symbology.aiFlag = AIFlag::AIM; + res.erase(2, 1); // Remove FNC1 + // The AIM Application Indicator characters "00"-"99" are left in the stream (ISO/IEC 24778:2008 16.2) + } } if (sai.index != -1) diff --git a/test/unit/aztec/AZDecoderTest.cpp b/test/unit/aztec/AZDecoderTest.cpp index 2d85313e4a..b9db236e25 100644 --- a/test/unit/aztec/AZDecoderTest.cpp +++ b/test/unit/aztec/AZDecoderTest.cpp @@ -145,6 +145,23 @@ static DecoderResult getData(std::string_view bitStr) return Aztec::Decode(bits); } +TEST(AZDecoderTest, InitialGS) +{ + // Issue #916 The first byte is lost when recognizing the Aztec code + { + // Initial + auto data = getData("1111101000000111010101010100010000100101001110001011100111000101001111111111111"); + EXPECT_EQ(data.symbologyIdentifier(), "]z0"); + EXPECT_EQ(data.content().text(TextMode::Hex), "1D 55 10 94 E2 E7 14 FF"); + } + { + // Initial FNC1 (invalid GS1 data) + auto data = getData("00000000000001011011111001100001000010010100111000101110011100010100111111111111"); + EXPECT_EQ(data.symbologyIdentifier(), "]z1"); + EXPECT_EQ(data.content().text(TextMode::Hex), "55 10 94 E2 E7 14 FF"); + } +} + TEST(AZDecoderTest, SymbologyIdentifier) { { From a76458e66bc80a9245b2c8021b749e9f8b15c530 Mon Sep 17 00:00:00 2001 From: axxel Date: Mon, 24 Mar 2025 14:58:26 +0100 Subject: [PATCH 021/104] PerspectiveTransform: add comment/link to doc --- core/src/PerspectiveTransform.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/PerspectiveTransform.h b/core/src/PerspectiveTransform.h index cc85fcb20c..3ac6699828 100644 --- a/core/src/PerspectiveTransform.h +++ b/core/src/PerspectiveTransform.h @@ -13,9 +13,11 @@ namespace ZXing { /** -*

This class implements a perspective transform in two dimensions. Given four source and four +* This class implements a perspective transform in two dimensions. Given four source and four * destination points, it will compute the transformation implied between them. The code is based -* directly upon section 3.4.2 of George Wolberg's "Digital Image Warping"; see pages 54-56.

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.