Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-15 10:08:08 +01:00
Code Issues Releases Wiki Activity

Check QT_VERSION_CHECK for QImage::sizeInBytes() or QImage::byteCount()

Browse Source
This commit is contained in:
Jonas Kvinge 2019-07-08 23:35:43 +02:00
parent 5f7efee00e
commit b5dd90b2d5
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/widgets/osd_x11.cpp
View File

@ -91,7 +91,11 @@ QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image) {
int channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3); int channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3);
arg << i.depth() / channels; arg << i.depth() / channels;
arg << channels; arg << channels;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.sizeInBytes()); arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.sizeInBytes());
#else
arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.byteCount());
#endif
arg.endStructure(); arg.endStructure();
return arg; return arg;