diff options
| author | selsta <selsta@sent.at> | 2020-04-16 03:14:48 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2020-04-16 19:11:29 +0200 |
| commit | a078705ec6fc86b4e178cda53302dacf2c1264b8 (patch) | |
| tree | c1ed9056010e496b597f9fbb9fa39b989f94e46a | |
| parent | 8e4124f06aa6c580ee62dd1b78735bc488e21366 (diff) | |
| download | monzero-gui-a078705ec6fc86b4e178cda53302dacf2c1264b8.tar.gz monzero-gui-a078705ec6fc86b4e178cda53302dacf2c1264b8.tar.xz monzero-gui-a078705ec6fc86b4e178cda53302dacf2c1264b8.zip | |
QrScanThread: use sizeInBytes to fix warning
| -rw-r--r-- | src/QR-Code-scanner/QrScanThread.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/QR-Code-scanner/QrScanThread.cpp b/src/QR-Code-scanner/QrScanThread.cpp index 8e1219c2..8f33f32d 100644 --- a/src/QR-Code-scanner/QrScanThread.cpp +++ b/src/QR-Code-scanner/QrScanThread.cpp @@ -80,7 +80,11 @@ bool QrScanThread::zimageFromQImage(const QImage &qimg, zbar::Image &dst) unsigned int bpl( qimg.bytesPerLine() ), width( bpl / 4), height( qimg.height()); dst.set_size(width, height); dst.set_format("BGR4"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + unsigned long datalen = qimg.sizeInBytes(); +#else unsigned long datalen = qimg.byteCount(); +#endif dst.set_data(qimg.bits(), datalen); if((width * 4 != bpl) || (width * height * 4 > datalen)){ emit notifyError(QString("QImage to Zbar::Image failed !")); |