paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 00:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl: don't create mask in SetTransparentColor, but remove old if exists. Create mask on demand. fixes #0011903

Browse Source 
git-svn-id: trunk@16232 -
This commit is contained in:
paul 2008-08-25 14:53:36 +00:00
parent b955aded7a
commit f4a27a76a4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/include/imglist.inc
View File

@ -639,15 +639,12 @@ var
begin
if AImage = nil then Exit;
// Paul: dont optimize. We need to call HandleNeeded before checking of maskhandle
// mwe: we should use MaskHandle without checking, but since TRasterImage only
// has a Transparent property and no Masked property, masks would also get
// generated for alpha images. Therefore we re rely now on the fact that a
// "native" mask handle is generated when a bitmaphandle is created.
// original stream can contain mask. it will be applied when we call BitmapHandleNeeded
// if we will not apply that mask - we can get some noise.
img := AImage.Handle;
if AMask = nil
then begin
if AImage.MaskHandleAllocated
if AImage.Masked
then msk := AImage.MaskHandle
else msk := 0;
end

5
lcl/include/rasterimage.inc
View File

@ -395,7 +395,9 @@ begin
then FTransparentMode := tmAuto
else FTransparentMode := tmFixed;
CreateMask;
if MaskHandleAllocated
then MaskHandle := 0
else Changed(Self);
end;
procedure TRasterImage.Changed(Sender: TObject);
@ -917,3 +919,4 @@ end;
// included by graphics.pp

4
lcl/interfaces/win32/win32lclintf.inc
View File

@ -596,14 +596,14 @@ begin
else
ABitmap := Windows.CreateBitmap(ADesc.Width, ADesc.Height, 1, 1, ARawImage.Data);
//DbgDumpBitmap(ABitmap, 'CreateBitmaps - Image');
DbgDumpBitmap(ABitmap, 'CreateBitmaps - Image');
if ASkipMask then Exit(True);
AMask := Windows.CreateBitmap(ADesc.Width, ADesc.Height, 1, 1, ARawImage.Mask);
if AMask = 0 then
DebugLn('Windows.CreateBitmap returns 0. Reason = ' + GetLastErrorText(Windows.GetLastError));
Result := AMask <> 0;
//DbgDumpBitmap(AMask, 'CreateBitmaps - Mask');
DbgDumpBitmap(AMask, 'CreateBitmaps - Mask');
end;
{------------------------------------------------------------------------------