1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save memcpy when converting to 32bit formats

Browse Source 
If the destination format is 32bit, we can convert directly in the
destination instead of in a buffer.

Change-Id: I2b4407da77b863deec7869c341e1a8d464b46600
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-03-20 15:35:23 +01:00 committed by Allan Sandfeld Jensen
parent b69ac5a0af
commit 31c251765d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/image/qimage_conversions.cpp
View File

@ -134,7 +134,8 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
Q_ASSERT(dest->format > QImage::Format_Indexed8); Q_ASSERT(dest->format > QImage::Format_Indexed8);
Q_ASSERT(src->format > QImage::Format_Indexed8); Q_ASSERT(src->format > QImage::Format_Indexed8);
const int buffer_size = 2048; const int buffer_size = 2048;
uint buffer[buffer_size]; uint buf[buffer_size];
uint *buffer = buf;
const QPixelLayout *srcLayout = &qPixelLayouts[src->format]; const QPixelLayout *srcLayout = &qPixelLayouts[src->format];
const QPixelLayout *destLayout = &qPixelLayouts[dest->format]; const QPixelLayout *destLayout = &qPixelLayouts[dest->format];
const uchar *srcData = src->data; const uchar *srcData = src->data;
@ -169,11 +170,16 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
int x = 0; int x = 0;
while (x < src->width) { while (x < src->width) {
dither.x = x; dither.x = x;
int l = qMin(src->width - x, buffer_size); int l = src->width - x;
if (destLayout->bpp == QPixelLayout::BPP32)
buffer = reinterpret_cast<uint *>(destData) + x;
else
l = qMin(l, buffer_size);
const uint *ptr = fetch(buffer, srcData, x, l); const uint *ptr = fetch(buffer, srcData, x, l);
ptr = convertToARGB32PM(buffer, ptr, l, 0, ditherPtr); ptr = convertToARGB32PM(buffer, ptr, l, 0, ditherPtr);
ptr = convertFromARGB32PM(buffer, ptr, l, 0, ditherPtr); ptr = convertFromARGB32PM(buffer, ptr, l, 0, ditherPtr);
store(destData, ptr, x, l); if (ptr != reinterpret_cast<uint *>(destData))
store(destData, ptr, x, l);
x += l; x += l;
} }
srcData += src->bytes_per_line; srcData += src->bytes_per_line;