monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QrScanThread: use sizeInBytes to fix warning

Browse source
This commit is contained in:
selsta 2020-04-16 03:14:48 +02:00
parent 8e4124f06a
commit a078705ec6
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/QR-Code-scanner/QrScanThread.cpp
View file

@ -80,7 +80,11 @@ bool QrScanThread::zimageFromQImage(const QImage &qimg, zbar::Image &dst)
unsigned int bpl( qimg.bytesPerLine() ), width( bpl / 4), height( qimg.height()); unsigned int bpl( qimg.bytesPerLine() ), width( bpl / 4), height( qimg.height());
dst.set_size(width, height); dst.set_size(width, height);
dst.set_format("BGR4"); dst.set_format("BGR4");
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
unsigned long datalen = qimg.sizeInBytes();
#else
unsigned long datalen = qimg.byteCount(); unsigned long datalen = qimg.byteCount();
#endif
dst.set_data(qimg.bits(), datalen); dst.set_data(qimg.bits(), datalen);
if((width * 4 != bpl) || (width * height * 4 > datalen)){ if((width * 4 != bpl) || (width * height * 4 > datalen)){
emit notifyError(QString("QImage to Zbar::Image failed !")); emit notifyError(QString("QImage to Zbar::Image failed !"));