paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 02:19:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* mask alpha channel when device has no alpha support

Browse Source 
git-svn-id: trunk@15754 -
This commit is contained in:
marc 2008-07-12 00:36:14 +00:00
parent 976269a47b
commit 832f32e752
3 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/include/intfbaselcl.inc
View File

@ -299,7 +299,8 @@ begin
ADesc.AlphaShift := Desc.AlphaShift;
end
else begin
if (Desc.Depth = 32) and (ADesc.Format = ricfRGBA)
if (Desc.Depth = 32) and (ADesc.Format = ricfRGBA)
and ([riqfMono, riqfGrey, riqfRGB] * AFlags <> [])
then ADesc.Depth := 24;
end;

17
lcl/include/rasterimage.inc
View File

@ -124,7 +124,7 @@ begin
then Include(QueryFlags, riqfAlpha);
if ImagePtr^.Description.MaskBitsPerPixel <> 0
then Include(QueryFlags, riqfMask);
DevDesc := QueryDescription(QueryFlags, W, H);
QueryDescription(DevDesc, QueryFlags, W, H);
if DevDesc.IsEqual(ImagePtr^.Description)
then begin
@ -135,8 +135,19 @@ begin
// create compatible copy
SrcImage := TLazIntfImage.Create(ImagePtr^, False);
DstImage := TLazIntfImage.Create(0, 0);
DstImage.DataDescription := DevDesc;
DstImage.CopyPixels(SrcImage);
// create mask for alphachannel when device has no alpha support
if (DevDesc.AlphaPrec = 0) and (riqfAlpha in QueryFlags)
then begin
//add mask if not already queried
if not (riqfMask in QueryFlags)
then QueryDescription(DevDesc, [riqfMask, riqfUpdate]);
DstImage.DataDescription := DevDesc;
DstImage.CopyPixels(SrcImage, 0, 0, True, $8000);
end
else begin
DstImage.DataDescription := DevDesc;
DstImage.CopyPixels(SrcImage);
end;
SrcImage.Free;
DstImage.GetRawImage(DevImage);
ImagePtr := @DevImage;

36
lcl/intfgraphics.pas
View File

@ -251,7 +251,8 @@ type
procedure SetRawImage(const ARawImage: TRawImage; ADataOwner: Boolean = True); virtual;
procedure GetRawImage(out ARawImage: TRawImage; ATransferOwnership: Boolean = False); virtual;
procedure FillPixels(const Color: TFPColor); virtual;
procedure CopyPixels(ASource: TFPCustomImage; XDst: Integer = 0; YDst: Integer = 0); virtual;
procedure CopyPixels(ASource: TFPCustomImage; XDst: Integer = 0; YDst: Integer = 0;
AlphaMask: Boolean = False; AlphaTreshold: Word = 0); virtual;
procedure AlphaFromMask(AKeepAlpha: Boolean = True);
procedure GetXYDataPostion(x, y: integer; out Position: TRawImagePosition);
procedure GetXYMaskPostion(x, y: integer; out Position: TRawImagePosition);
@ -552,6 +553,7 @@ type
// extra Rawimage utility functions
function QueryDescription(AFlags: TRawImageQueryFlags; AWidth: Integer = -1; AHeight: integer = -1): TRawImageDescription;
procedure QueryDescription(var ADesc: TRawImageDescription; AFlags: TRawImageQueryFlags; AWidth: Integer = -1; AHeight: integer = -1);
function GetDescriptionFromDevice(ADC: HDC; AWidth: Integer = -1; AHeight: integer = -1): TRawImageDescription;
function GetDescriptionFromBitmap(ABitmap: HBitmap; AWidth: Integer = -1; AHeight: integer = -1): TRawImageDescription;
function AddAlphaToDescription(var ADesc: TRawImageDescription; APrec: Byte): Boolean;
@ -653,13 +655,19 @@ begin
+',b='+hexStr(FPColor.blue,4)+',a='+hexStr(FPColor.alpha,4);
end;
function QueryDescription(AFlags: TRawImageQueryFlags; AWidth: Integer; AHeight: integer): TRawImageDescription;
function QueryDescription(AFlags: TRawImageQueryFlags; AWidth: Integer = -1; AHeight: integer = -1): TRawImageDescription;
begin
if not (riqfUpdate in AFlags) then Result.Init;
Exclude(AFlags, riqfUpdate);
QueryDescription(Result, AFlags, AWidth, AHeight);
end;
if not RawImage_QueryDescription(AFlags, Result) then Exit;
if AWidth <> -1 then Result.Width := AWidth;
if AHeight <> -1 then Result.Height := AHeight;
procedure QueryDescription(var ADesc: TRawImageDescription; AFlags: TRawImageQueryFlags; AWidth: Integer = -1; AHeight: integer = -1);
begin
if not (riqfUpdate in AFlags) then ADesc.Init;
if not RawImage_QueryDescription(AFlags, ADesc) then Exit;
if AWidth <> -1 then ADesc.Width := AWidth;
if AHeight <> -1 then ADesc.Height := AHeight;
end;
function GetDescriptionFromDevice(ADC: HDC; AWidth, AHeight: integer): TRawImageDescription;
@ -3227,10 +3235,12 @@ begin
// ToDo: mask
end;
procedure TLazIntfImage.CopyPixels(ASource: TFPCustomImage; XDst: Integer = 0; YDst: Integer = 0);
procedure TLazIntfImage.CopyPixels(ASource: TFPCustomImage; XDst, YDst: Integer;
AlphaMask: Boolean; AlphaTreshold: Word);
var
SrcImg: TLazIntfImage absolute ASource;
x, y, xStop, yStop: Integer;
c: TFPColor;
begin
{
if (Src.Width<>Width) or (Src.Height<>Height) then
@ -3256,15 +3266,21 @@ begin
then yStop := Height - YDst;
Dec(xStop);
Dec(yStop);
for y:=0 to yStop do
for x:=0 to xStop do
Colors[x+XDst,y+YDst] := ASource.Colors[x,y];
if ASource is TLazIntfImage then
for y:=0 to yStop do
for x:=0 to xStop do
Masked[x+XDst,y+YDst] := SrcImg.Masked[x,y];
for y:=0 to yStop do
for x:=0 to xStop do
begin
c := ASource.Colors[x,y];
Colors[x+XDst,y+YDst] := c;
if AlphaMask and (c.alpha < AlphaTreshold)
then Masked[x+XDst,y+YDst] := True;
end;
end;
{ TLazReaderXPM }