Qt: fixed conversion of QImage::RGB32 without mask. issue #25590

git-svn-id: trunk@43790 -
This commit is contained in:
zeljko 2014-01-25 09:46:29 +00:00
parent 8e15025003
commit 4ba9ae2cdc

View File

@ -3524,8 +3524,10 @@ begin
{Workaround: we must convert image to ARGB32 , since we can get strange
results with RGB32 images on Linux and Win32 if DstRect <> sourceRect.
Explanation: Look at #11713 linux & win screenshoots.
Note: This is slower operation than QImage_scaled() we used before.}
if not EqualRect(LocalRect, sourceRect^) and
Note: This is slower operation than QImage_scaled() we used before.
Issue #25590 - check if we are RGB32 and mask is nil, so make conversion
too.}
if (not EqualRect(LocalRect, sourceRect^) or (Mask = nil)) and
(QImage_format(Image) = QImageFormat_RGB32) then
begin