paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 13:00:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Don't copy mask when MaskBitsPerPixel = 0

Browse Source 
git-svn-id: trunk@16371 -
This commit is contained in:
marc 2008-09-02 22:59:01 +00:00
parent 5d9091197c
commit 98c9fb0791
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/intfgraphics.pas
View File

@ -10,7 +10,7 @@
* *
* This file is part of the Lazarus Component Library (LCL) *
* *
* See the file COPYING.modifiedLGPL.txt, included in this distribution, *
* See the file COPYING.modifiedLGPL.txt, included in this distribution, *
* for details about the copyright. *
* *
* This program is distributed in the hope that it will be useful, *
@ -499,6 +499,8 @@ type
procedure InternalRead(Stream: TStream; Img: TFPCustomImage); override;
end;
{ TLazReaderPNG }
TLazReaderPNG = class(TFPReaderPNG, ILazImageReader)
@ -3247,6 +3249,7 @@ procedure TLazIntfImage.CopyPixels(ASource: TFPCustomImage; XDst, YDst: Integer;
AlphaMask: Boolean; AlphaTreshold: Word);
var
SrcImg: TLazIntfImage absolute ASource;
SrcHasMask: Boolean;
x, y, xStop, yStop: Integer;
c: TFPColor;
begin
@ -3275,10 +3278,15 @@ begin
Dec(xStop);
Dec(yStop);
if ASource is TLazIntfImage then
if (FRawImage.Description.MaskBitsPerPixel > 0)
and (ASource is TLazIntfImage)
then begin
SrcHasMask := SrcImg.FRawImage.Description.MaskBitsPerPixel > 0;
for y:=0 to yStop do
for x:=0 to xStop do
Masked[x+XDst,y+YDst] := SrcImg.Masked[x,y];
Masked[x+XDst,y+YDst] := SrcHasMask and SrcImg.Masked[x,y];
end;
for y:=0 to yStop do
for x:=0 to xStop do