whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multi-threaded shrinking conversion 

The conversion takes place in separate blocks, but may need to be
compressed after converting.

Fixes: QTBUG-82818
Change-Id: I71431af3d41e1bfe1f9b3d8cd7c1e0a2020846cd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
bb10
Allan Sandfeld Jensen 2020-03-11 14:29:03 +01:00
parent 296bbbfa50
commit 198d8eb5d0
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
uint buf[BufferSize];
uint *buffer = buf;
uchar *srcData = data->data + data->bytes_per_line * yStart;
uchar *destData = srcData;
uchar *destData = srcData; // This can be temporarily wrong if we doing a shrinking conversion
QDitherInfo dither;
QDitherInfo *ditherPtr = nullptr;
if ((flags & Qt::PreferDither) && (flags & Qt::Dither_Mask) != Qt::ThresholdDither)
@ -403,6 +403,18 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
y += yn;
}
semaphore.acquire(segments);
if (data->bytes_per_line != params.bytesPerLine) {
// Compress segments to a continuous block
y = 0;
for (int i = 0; i < segments; ++i) {
int yn = (data->height - y) / (segments - i);
uchar *srcData = data->data + data->bytes_per_line * y;
uchar *destData = data->data + params.bytesPerLine * y;
if (srcData != destData)
memmove(destData, srcData, params.bytesPerLine * yn);
y += yn;
}
}
} else
#endif
convertSegment(0, data->height);