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

do not detach from QImage::setColorCount() if color count is not different

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-30 22:46:37 +00:00
parent 09dddc3258
commit e6d2f453c7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1699,7 +1699,7 @@ void QImage::fill(const QColor &color)
uint pixel = color.rgba();
if (d->format == QImage::Format_ARGB32_Premultiplied)
pixel = PREMUL(pixel);
fill((uint) pixel);
fill(pixel);
} else if (d->depth == 16 && d->format == QImage::Format_RGB16) {
qrgb565 p(color.rgba());
@ -1807,12 +1807,12 @@ void QImage::setColorCount(int colorCount)
if (!d) {
qWarning("QImage::setColorCount: null image");
return;
} else if (colorCount == d->colortable.size()) {
return;
}
detach();
if (colorCount == d->colortable.size())
return;
if (colorCount <= 0) { // use no color table
d->colortable = QVector<QRgb>();
return;