From 8d4cda030e445d2b64cc327af125b538e014ecb0 Mon Sep 17 00:00:00 2001 From: xiphon Date: Mon, 21 Dec 2020 19:58:27 +0000 Subject: QR-Code-scanner: integrate QUIRC library, implement QrDecoder, drop ZBar --- src/QR-Code-scanner/QrScanThread.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/QR-Code-scanner/QrScanThread.h') diff --git a/src/QR-Code-scanner/QrScanThread.h b/src/QR-Code-scanner/QrScanThread.h index b6daa29f..7dfffc55 100644 --- a/src/QR-Code-scanner/QrScanThread.h +++ b/src/QR-Code-scanner/QrScanThread.h @@ -35,9 +35,10 @@ #include #include #include -#include -class QrScanThread : public QThread, public zbar::Image::Handler +#include "Decoder.h" + +class QrScanThread : public QThread { Q_OBJECT @@ -47,20 +48,16 @@ public: virtual void stop(); Q_SIGNALS: - void decoded(int type, const QString &data); + void decoded(const QString &data); void notifyError(const QString &error, bool warning = false); protected: virtual void run(); void processVideoFrame(const QVideoFrame &); void processQImage(const QImage &); - void processZImage(zbar::Image &image); - virtual void image_callback(zbar::Image &image); - bool zimageFromQImage(const QImage&, zbar::Image &); private: - zbar::ImageScanner m_scanner; - QSharedPointer m_image; + QrDecoder m_decoder; bool m_running; QMutex m_mutex; QWaitCondition m_waitCondition; -- cgit v1.2.3