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

* Implemented minimalistic PixelFormat dependency when creating rawimage description (Mono|RGB|Alpha) (fixes #11672)

Browse Source 
* Forced full rawimage data before copying date when unsharing bitmap (sideeffect notices in #11672)

git-svn-id: trunk@15804 -
This commit is contained in:
marc 2008-07-17 20:08:20 +00:00
parent 00f660ac0c
commit 210a124450
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/include/custombitmap.inc
View File

@ -113,6 +113,7 @@ procedure TCustomBitmap.RawimageNeeded(ADescOnly: Boolean);
var
OldChangeEvent: TNotifyEvent;
ImagePtr: PRawImage;
Flags: TRawImageQueryFlags;
begin
ImagePtr := @TSharedCustomBitmap(FSharedImage).FImage;
if ImagePtr^.Description.Format <> ricfNone
@ -137,7 +138,18 @@ begin
end;
// keep size
ImagePtr^.Description := GetDescriptionFromDevice(0, ImagePtr^.Description.Width, ImagePtr^.Description.Height);
// ImagePtr^.Description := GetDescriptionFromDevice(0, ImagePtr^.Description.Width, ImagePtr^.Description.Height);
// use query to get a default description without alpha, since alpha drawing
// is not yet supported (unless asked for)
case PixelFormat of
pf1bit: Flags := [riqfMono, riqfMask];
pf4bit,
pf8bit: Flags := [riqfRGB, riqfMask, riqfPalette];
pf32bit: Flags := [riqfRGB, riqfMask, riqfAlpha];
else
Flags := [riqfRGB, riqfMask];
end;
ImagePtr^.Description := QueryDescription(Flags, ImagePtr^.Description.Width, ImagePtr^.Description.Height);
Exit;
end;
@ -307,7 +319,11 @@ begin
try
NewImage.Reference;
if CopyContent and OldImage.ImageAllocated
then OldImage.FImage.ExtractRect(Rect(0, 0, Width, Height), NewImage.FImage);
then begin
// force a complete rawimage, so we can copy it
RawimageNeeded(False);
OldImage.FImage.ExtractRect(Rect(0, 0, Width, Height), NewImage.FImage);
end;
FreeCanvasContext;
FSharedImage := NewImage;