Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream private QImage member indicating alpha too [ci reset]

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-19 02:57:03 +02:00
parent 2a81a8a477
commit 3668690694
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/image/qimage.cpp
View file

@ -3759,6 +3759,7 @@ QDataStream &operator<<(QDataStream &s, const QImage &image)
s << (qint64) image.dotsPerMeterY();
s << (qint64) image.byteCount();
s << image.colorTable();
s << (bool)image.d->has_alpha_clut;
s.writeRawData(reinterpret_cast<const char*>(image.constBits()), image.byteCount());
return s;
}
@ -3782,6 +3783,7 @@ QDataStream &operator>>(QDataStream &s, QImage &image)
qint64 dotspery;
qint64 bytecount;
QVector<QRgb> colortable;
bool alphaclut;
s >> format;
s >> width;
s >> height;
@ -3789,6 +3791,7 @@ QDataStream &operator>>(QDataStream &s, QImage &image)
s >> dotspery;
s >> bytecount;
s >> colortable;
s >> alphaclut;
image = QImage(width, height, static_cast<QImage::Format>(format));
if (image.isNull()) {
@ -3803,6 +3806,7 @@ QDataStream &operator>>(QDataStream &s, QImage &image)
return s;
}
image.d->has_alpha_clut = alphaclut;
image.d->colortable = colortable;
image.d->dpmx = dotsperx;
image.d->dpmy = dotspery;

1
src/gui/image/qimage.h
View file

@ -214,6 +214,7 @@ private:
friend class QSpanData;
friend class QPngHandler;
#if !defined(QT_NO_DATASTREAM)
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QImage &);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QImage &);
#endif
};