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

optimize QPixmapData::toImage()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-15 00:35:16 +00:00
parent 29c8c34392
commit dfb87495bf
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/image/qpixmap_raster.cpp
View file

@ -282,14 +282,7 @@ QImage QRasterPixmapData::toImage(const QRect &rect) const
if (rect.isNull()) if (rect.isNull())
return image; return image;
QRect clipped = rect.intersected(QRect(0, 0, w, h)); return image.copy(rect);
const uint du = uint(d);
if ((du % 8 == 0) && (((uint(clipped.x()) * du)) % 32 == 0))
return QImage(image.scanLine(clipped.y()) + clipped.x() * (du / 8),
clipped.width(), clipped.height(),
image.bytesPerLine(), image.format());
else
return image.copy(clipped);
} }
void QRasterPixmapData::setAlphaChannel(const QPixmap &alphaChannel) void QRasterPixmapData::setAlphaChannel(const QPixmap &alphaChannel)

9
src/gui/image/qpixmapdata.cpp
View file

@ -247,10 +247,11 @@ void QPixmapData::setSerialNumber(int serNo)
QImage QPixmapData::toImage(const QRect &rect) const QImage QPixmapData::toImage(const QRect &rect) const
{ {
if (rect.contains(QRect(0, 0, w, h))) QImage image = toImage();
return toImage(); if (rect.isNull())
else return image;
return toImage().copy(rect);
return image.copy(rect);
} }
QImage* QPixmapData::buffer() QImage* QPixmapData::buffer()