Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Always use qint32 for QDBusArgument

This commit is contained in:
Jonas Kvinge 2020-08-23 21:55:34 +02:00
parent 82142751de
commit 51b379502f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osd/osddbus.cpp
View File

@ -78,19 +78,21 @@ QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image) {
#endif #endif
arg.beginStructure(); arg.beginStructure();
arg << i.width(); arg << static_cast<qint32>(i.width());
arg << i.height(); arg << static_cast<qint32>(i.height());
arg << static_cast<qint32>(i.bytesPerLine()); arg << static_cast<qint32>(i.bytesPerLine());
arg << i.hasAlphaChannel(); arg << i.hasAlphaChannel();
int channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3); qint32 channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3);
arg << i.depth() / channels; qint32 bitspersample = i.depth() / channels;
arg << bitspersample;
arg << channels; arg << channels;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) #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.constBits()), static_cast<int>(i.sizeInBytes()));
#else #else
arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.byteCount()); arg << QByteArray(reinterpret_cast<const char*>(i.constBits()), i.byteCount());
#endif #endif
arg.endStructure(); arg.endStructure();
return arg; return arg;
} }