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

* fix issue #10047, crash when masked image is stretched

Browse Source 
git-svn-id: trunk@12649 -
This commit is contained in:
marc 2007-10-30 22:32:04 +00:00
parent 4565399fd4
commit f30ed6d999
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/gtk/gtkproc.inc
View File

@ -1201,7 +1201,7 @@ begin
Exit;
end;
ScaleMsk := CreatePixbufFromDrawable(ASrcMask, ASrcColorMap, True, ASrcX, ASrcY, 0, 0, ASrcWidth, ASrcHeight);
ScaleMsk := CreatePixbufFromDrawable(ASrcMask, nil, True, ASrcX, ASrcY, 0, 0, ASrcWidth, ASrcHeight);
ApplyMask(gdk_pixbuf_get_pixels(ScaleSrc), gdk_pixbuf_get_pixels(ScaleMsk));
gdk_pixbuf_unref(ScaleMsk);
end;
@ -5798,13 +5798,20 @@ begin
then Pixbuf := gdk_pixbuf_new(GDK_COLORSPACE_RGB, True, 8, AWidth, AHeight)
else Pixbuf := nil;
{$ifdef gtk1}
// gtk1 requires always a colormap and fails when none passed
// gtk2 fails when the depth of a colormap depth is different than the drawable
// depth. It wil use the correct system map when none passed
if AColorMap = nil
then AColorMap := gdk_colormap_get_system;
{$endif}
Result := gdk_pixbuf_get_from_drawable(Pixbuf, ASource, AColorMap, ASrcX, ASrcY, ADstX, ADstY, AWidth, AHeight);
if CanRequestAlpha then Exit; // we're done
if not AIncludeAplha then Exit;
pixbuf := gdk_pixbuf_add_alpha(Result, false, guchar(#0),guchar(#0),guchar(#0));
pixbuf := gdk_pixbuf_add_alpha(Result, false, guchar(0),guchar(0),guchar(0));
gdk_pixbuf_unref(Result);
Result := pixbuf;
end;