mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-07-24 06:45:59 +02:00
added some gdkpixbuf debugging
git-svn-id: trunk@7708 -
This commit is contained in:
parent
3fa34fd61f
commit
e15d34e787
@ -1808,17 +1808,29 @@ var
|
|||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
SRC := nil;
|
SRC := nil;
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufFile A1');
|
||||||
|
{$ENDIF}
|
||||||
SRC := gdk_pixbuf_new_from_file(FileName{$IFDEF Gtk2},nil{$ENDIF});
|
SRC := gdk_pixbuf_new_from_file(FileName{$IFDEF Gtk2},nil{$ENDIF});
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufFile A2');
|
||||||
|
{$ENDIF}
|
||||||
If SRC = nil then
|
If SRC = nil then
|
||||||
exit;
|
exit;
|
||||||
Width := gdk_pixbuf_get_width(Src);
|
Width := gdk_pixbuf_get_width(Src);
|
||||||
Height := gdk_pixbuf_get_height(Src);
|
Height := gdk_pixbuf_get_height(Src);
|
||||||
|
|
||||||
TMP := CreateCompatibleBitmap(0, Width, Height);
|
TMP := CreateCompatibleBitmap(0, Width, Height);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufFile B1');
|
||||||
|
{$ENDIF}
|
||||||
gdk_pixbuf_render_pixmap_and_mask(Src,
|
gdk_pixbuf_render_pixmap_and_mask(Src,
|
||||||
PGDIObject(TMP)^.GDIPixmapObject,
|
PGDIObject(TMP)^.GDIPixmapObject,
|
||||||
PGDIObject(TMP)^.GDIBitmapMaskObject,
|
PGDIObject(TMP)^.GDIBitmapMaskObject,
|
||||||
0);
|
0);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufFile B2');
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
||||||
Depth := gdk_drawable_get_depth(PGDIObject(TMP)^.GDIPixmapObject);
|
Depth := gdk_drawable_get_depth(PGDIObject(TMP)^.GDIPixmapObject);
|
||||||
@ -1921,10 +1933,16 @@ Type
|
|||||||
|
|
||||||
With PGDIObject(Bitmap)^ do begin
|
With PGDIObject(Bitmap)^ do begin
|
||||||
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufData A1');
|
||||||
|
{$ENDIF}
|
||||||
gdk_pixbuf_render_pixmap_and_mask(Src,
|
gdk_pixbuf_render_pixmap_and_mask(Src,
|
||||||
GDIPixmapObject,
|
GDIPixmapObject,
|
||||||
GDIBitmapMaskObject,
|
GDIBitmapMaskObject,
|
||||||
0);
|
0);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('TGtkWidgetSet.LoadFromPixbufData A2');
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
|
|
||||||
Depth := gdk_drawable_get_depth(GDIPixmapObject);
|
Depth := gdk_drawable_get_depth(GDIPixmapObject);
|
||||||
@ -1995,10 +2013,16 @@ var
|
|||||||
gbBitmap:
|
gbBitmap:
|
||||||
If Bitmap^.GDIBitmapObject <> nil then begin
|
If Bitmap^.GDIBitmapObject <> nil then begin
|
||||||
{$IfNDef NoGDKPixbuflib}
|
{$IfNDef NoGDKPixbuflib}
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('DataSourceInitialize A1');
|
||||||
|
{$ENDIF}
|
||||||
Source := gdk_pixbuf_get_from_drawable(nil, Bitmap^.GDIBitmapObject,
|
Source := gdk_pixbuf_get_from_drawable(nil, Bitmap^.GDIBitmapObject,
|
||||||
Bitmap^.Colormap,0,StartScan,0,0,Width,StartScan + NumScans);
|
Bitmap^.Colormap,0,StartScan,0,0,Width,StartScan + NumScans);
|
||||||
rowstride := gdk_pixbuf_get_rowstride(Source);
|
rowstride := gdk_pixbuf_get_rowstride(Source);
|
||||||
Pixels := PByte(gdk_pixbuf_get_pixels(Source));
|
Pixels := PByte(gdk_pixbuf_get_pixels(Source));
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('DataSourceInitialize A2');
|
||||||
|
{$ENDIF}
|
||||||
{$else}
|
{$else}
|
||||||
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
||||||
Source := gdk_image_get(Bitmap^.GDIBitmapObject, 0, StartScan, Width,
|
Source := gdk_image_get(Bitmap^.GDIBitmapObject, 0, StartScan, Width,
|
||||||
@ -2008,8 +2032,14 @@ var
|
|||||||
gbPixmap:
|
gbPixmap:
|
||||||
If Bitmap^.GDIPixmapObject <> nil then begin
|
If Bitmap^.GDIPixmapObject <> nil then begin
|
||||||
{$IfNDef NoGDKPixbuflib}
|
{$IfNDef NoGDKPixbuflib}
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('DataSourceInitialize B1');
|
||||||
|
{$ENDIF}
|
||||||
Source := gdk_pixbuf_get_from_drawable(nil, Bitmap^.GDIPixmapObject,
|
Source := gdk_pixbuf_get_from_drawable(nil, Bitmap^.GDIPixmapObject,
|
||||||
Bitmap^.Colormap,0,StartScan,0,0,Width,StartScan + NumScans);
|
Bitmap^.Colormap,0,StartScan,0,0,Width,StartScan + NumScans);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('DataSourceInitialize B2');
|
||||||
|
{$ENDIF}
|
||||||
rowstride := gdk_pixbuf_get_rowstride(Source);
|
rowstride := gdk_pixbuf_get_rowstride(Source);
|
||||||
Pixels := PByte(gdk_pixbuf_get_pixels(Source));
|
Pixels := PByte(gdk_pixbuf_get_pixels(Source));
|
||||||
{$else}
|
{$else}
|
||||||
@ -5647,7 +5677,13 @@ begin
|
|||||||
DebugLn('WARNING: TGtkWidgetSet.LoadXPMFromLazResource: '+e.Message);
|
DebugLn('WARNING: TGtkWidgetSet.LoadXPMFromLazResource: '+e.Message);
|
||||||
end;
|
end;
|
||||||
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('LoadPixbufFromLazResource A1');
|
||||||
|
{$ENDIF}
|
||||||
pixbuf:=gdk_pixbuf_new_from_xpm_data(ImgData);
|
pixbuf:=gdk_pixbuf_new_from_xpm_data(ImgData);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('LoadPixbufFromLazResource A2');
|
||||||
|
{$ENDIF}
|
||||||
{$IFDEF DebugGDK}EndGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}EndGDKErrorTrap;{$ENDIF}
|
||||||
FreeMem(ImgData);
|
FreeMem(ImgData);
|
||||||
end;
|
end;
|
||||||
|
@ -338,7 +338,13 @@ end;
|
|||||||
{$IfNDef NoGdkPixbufLib}
|
{$IfNDef NoGdkPixbufLib}
|
||||||
Procedure gdk_pixbuf_render_pixmap_and_mask(pixbuf : PGdkPixbuf; var pixmap_return : PGdkPixmap; var mask_return : PGdkBitmap; alpha_threshold : gint);
|
Procedure gdk_pixbuf_render_pixmap_and_mask(pixbuf : PGdkPixbuf; var pixmap_return : PGdkPixmap; var mask_return : PGdkBitmap; alpha_threshold : gint);
|
||||||
begin
|
begin
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('gdk_pixbuf_render_pixmap_and_mask A1');
|
||||||
|
{$ENDIF}
|
||||||
gdkpixbuf.gdk_pixbuf_render_pixmap_and_mask(pixbuf, @pixmap_return, @mask_return, alpha_threshold);
|
gdkpixbuf.gdk_pixbuf_render_pixmap_and_mask(pixbuf, @pixmap_return, @mask_return, alpha_threshold);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('gdk_pixbuf_render_pixmap_and_mask A2');
|
||||||
|
{$ENDIF}
|
||||||
end;
|
end;
|
||||||
{$EndIf}
|
{$EndIf}
|
||||||
|
|
||||||
@ -1282,7 +1288,13 @@ begin
|
|||||||
'');
|
'');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
DummyMask:=nil;
|
DummyMask:=nil;
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('ScalePixmap A1');
|
||||||
|
{$ENDIF}
|
||||||
gdk_pixbuf_render_pixmap_and_mask(ScaleDest,NewPixmap,DummyMask,0);
|
gdk_pixbuf_render_pixmap_and_mask(ScaleDest,NewPixmap,DummyMask,0);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('ScalePixmap A2');
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
// clean up
|
// clean up
|
||||||
{$IFDEF VerboseStretchCopyArea}
|
{$IFDEF VerboseStretchCopyArea}
|
||||||
@ -5245,7 +5257,13 @@ begin
|
|||||||
DebugLn('WARNING: TGtkWidgetSet.LoadXPMFromLazResource: '+e.Message);
|
DebugLn('WARNING: TGtkWidgetSet.LoadXPMFromLazResource: '+e.Message);
|
||||||
end;
|
end;
|
||||||
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}BeginGDKErrorTrap;{$ENDIF}
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('LoadPixbufFromLazResource A1');
|
||||||
|
{$ENDIF}
|
||||||
pixbuf:=gdk_pixbuf_new_from_xpm_data(ImgData);
|
pixbuf:=gdk_pixbuf_new_from_xpm_data(ImgData);
|
||||||
|
{$IFDEF VerboseGdkPixbuf}
|
||||||
|
debugln('LoadPixbufFromLazResource A2');
|
||||||
|
{$ENDIF}
|
||||||
{$IFDEF DebugGDK}EndGDKErrorTrap;{$ENDIF}
|
{$IFDEF DebugGDK}EndGDKErrorTrap;{$ENDIF}
|
||||||
FreeMem(ImgData);
|
FreeMem(ImgData);
|
||||||
end;
|
end;
|
||||||
|
Loading…
Reference in New Issue
Block a user