diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 20:52:33 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 20:52:33 -0500 |
| commit | 8a73fd241e28965b2a36b2f232112bf44f58211d (patch) | |
| tree | 796697e07b44d5ac2a566a8ac242700a86ca421a /src | |
| parent | 9760886eff0e7c2a3dbf46db2a53d55e3db6629f (diff) | |
| parent | a078705ec6fc86b4e178cda53302dacf2c1264b8 (diff) | |
| download | monzero-gui-8a73fd241e28965b2a36b2f232112bf44f58211d.tar.gz monzero-gui-8a73fd241e28965b2a36b2f232112bf44f58211d.tar.xz monzero-gui-8a73fd241e28965b2a36b2f232112bf44f58211d.zip | |
Merge pull request #2835
a078705 QrScanThread: use sizeInBytes to fix warning (selsta)
Diffstat (limited to 'src')
| -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 !")); |