mirror of
https://github.com/wownero/wowlet.git
synced 2026-10-24 02:28:33 +02:00
depends: zxing-cpp: update to 3.0.2
Co-authored-by: hosiet <073plan@gmail.com>
This commit is contained in:
@@ -1,12 +1,17 @@
|
||||
package=zxing-cpp
|
||||
$(package)_version=2.3.0
|
||||
$(package)_download_path=https://github.com/$(package)/$(package)/archive/refs/tags
|
||||
$(package)_download_file=v$($(package)_version).tar.gz
|
||||
$(package)_version=3.0.2
|
||||
$(package)_download_path=https://github.com/zxing-cpp/zxing-cpp/releases/download/v$($(package)_version)
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba
|
||||
$(package)_sha256_hash=e957f13e2ad4e31badb3d9af3f6ba8999a3ca3c9cc4d6bafc98032f9cce1a090
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts=-DBUILD_WRITERS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF
|
||||
$(package)_config_opts += -DZXING_WRITERS=OFF
|
||||
$(package)_config_opts += -DZXING_EXAMPLES=OFF
|
||||
$(package)_config_opts += -DZXING_C_API=OFF
|
||||
$(package)_config_opts += -DZXING_EXAMPLES_QT=OFF
|
||||
$(package)_config_opts += -DZXING_BLACKBOX_TESTS=OFF
|
||||
$(package)_config_opts += -DBUILD_SHARED_LIBS=OFF
|
||||
$(package)_config_opts += -DZXING_TEST_DOTNET=OFF
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user