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

cocoa: #32749. invalidating (and discarding) the original non-premultiplied data, if it has been modified by NSBitmapContext in NSImageRep. Changing bitmap handle recreation prior to drawing the bitmap. The change has been tested with samples from #28692 and #28102.

Browse Source 
git-svn-id: trunk@56715 -
This commit is contained in:
dmitry 2017-12-14 06:44:51 +00:00
parent c35b4b0f90
commit eda7fd2cd0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/interfaces/cocoa/cocoagdiobjects.pas
View File

@ -989,6 +989,12 @@ end;
procedure TCocoaBitmap.SetModified; procedure TCocoaBitmap.SetModified;
begin begin
if FOriginalData <> nil then
begin
// the original data no longer applies, as imageRep was modified
System.FreeMem(FOriginalData);
FOriginalData:=nil;
end;
FModified_SinceLastRecreate := True; FModified_SinceLastRecreate := True;
end; end;
@ -2095,6 +2101,9 @@ begin
if not Assigned(Bmp) then if not Assigned(Bmp) then
Exit(False); Exit(False);
// Make sure that bitmap is the most up-to-date
Bmp.ReCreateHandle_IfModified(); // Fix for bug 28102
if (Msk <> nil) and (Msk.Image <> nil) then if (Msk <> nil) and (Msk.Image <> nil) then
begin begin
MskImage := Msk.CreateMaskImage(Bounds(XMsk, YMsk, SrcWidth, SrcHeight)); MskImage := Msk.CreateMaskImage(Bounds(XMsk, YMsk, SrcWidth, SrcHeight));
@ -2110,14 +2119,12 @@ begin
CGImageRelease(MskImage); CGImageRelease(MskImage);
CGContextRestoreGState(CGContext); CGContextRestoreGState(CGContext);
Bmp.ReCreateHandle_IfModified(); // Fix for bug 28102
end end
else else
begin begin
// convert Y coordinate of the source bitmap // convert Y coordinate of the source bitmap
YSrc := Bmp.Height - (SrcHeight + YSrc); YSrc := Bmp.Height - (SrcHeight + YSrc);
Result := DrawImageRep(GetNSRect(X, Y, Width, Height),GetNSRect(XSrc, YSrc, SrcWidth, SrcHeight), bmp.ImageRep); Result := DrawImageRep(GetNSRect(X, Y, Width, Height),GetNSRect(XSrc, YSrc, SrcWidth, SrcHeight), bmp.ImageRep);
Bmp.ReCreateHandle_IfModified(); // Fix for bug 28102
end; end;
AttachedBitmap_SetModified(); AttachedBitmap_SetModified();
end; end;