Description: Enable compatibility with zxing-cpp 3.0.0. This can be removed when it is applied upstream. Author: Boyuan Yang Forwarded: https://github.com/feather-wallet/feather/issues/288 Last-Update: 2026-02-26 diff --git a/src/qrcode/scanner/QrScanThread.cpp b/src/qrcode/scanner/QrScanThread.cpp index e1ecaf9..d47a5b6 100644 --- a/src/qrcode/scanner/QrScanThread.cpp +++ b/src/qrcode/scanner/QrScanThread.cpp @@ -15,7 +15,7 @@ QrScanThread::QrScanThread(QObject *parent) void QrScanThread::processQImage(const QImage &qimg) { - const auto hints = ZXing::DecodeHints() + const auto hints = ZXing::ReaderOptions() .setFormats(ZXing::BarcodeFormat::QRCode) .setTryHarder(true) .setMaxNumberOfSymbols(1); @@ -62,4 +62,4 @@ void QrScanThread::run() processQImage(m_queue.takeFirst()); } } -} \ No newline at end of file +} diff --git a/src/qrcode/utils/QrCodeUtils.cpp b/src/qrcode/utils/QrCodeUtils.cpp index e957780..22ecd02 100644 --- a/src/qrcode/utils/QrCodeUtils.cpp +++ b/src/qrcode/utils/QrCodeUtils.cpp @@ -3,7 +3,7 @@ #include "QrCodeUtils.h" -Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::DecodeHints& hints) +Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::ReaderOptions& hints) { auto ImgFmtFromQImg = [](const QImage& img){ switch (img.format()) { @@ -50,7 +50,7 @@ Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::DecodeHints& hin QString QrCodeUtils::scanImage(const QImage &img) { - const auto hints = ZXing::DecodeHints() + const auto hints = ZXing::ReaderOptions() .setFormats(ZXing::BarcodeFormat::QRCode | ZXing::BarcodeFormat::DataMatrix) .setTryHarder(true) .setBinarizer(ZXing::Binarizer::FixedThreshold); @@ -58,4 +58,4 @@ QString QrCodeUtils::scanImage(const QImage &img) { const auto result = ReadBarcode(img, hints); return result.text(); -} \ No newline at end of file +} diff --git a/src/qrcode/utils/QrCodeUtils.h b/src/qrcode/utils/QrCodeUtils.h index 305bc96..b41c7be 100644 --- a/src/qrcode/utils/QrCodeUtils.h +++ b/src/qrcode/utils/QrCodeUtils.h @@ -27,7 +27,7 @@ private: class QrCodeUtils { public: static QString scanImage(const QImage &img); - static Result ReadBarcode(const QImage& img, const ZXing::DecodeHints& hints = { }); + static Result ReadBarcode(const QImage& img, const ZXing::ReaderOptions& hints = { }); }; #endif //FEATHER_QRCODEUTILS_H