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

fixed DebugLn for VerboseRawImage

Browse Source 
git-svn-id: trunk@5785 -
This commit is contained in:
mattias 2004-08-13 20:40:27 +00:00
parent 9ed2e1f1a3
commit ff34223015
3 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/graphtype.pp
View File

@ -248,7 +248,7 @@ begin
or (RawImage^.Description.Width=0) or (RawImage^.Description.Height=0)
or (RawImage^.Description.AlphaPrec=0) then begin
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty Quicktest: empty');
DebugLn('RawImageMaskIsEmpty Quicktest: empty');
{$ENDIF}
exit;
end;
@ -276,7 +276,7 @@ begin
if p^<>$ff then begin
// not all bits set -> transparent pixels found -> Mask needed
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty FullByte y=',y,' x=',x,' Byte=',HexStr(Cardinal(p^),2));
DebugLn('RawImageMaskIsEmpty FullByte y=',dbgs(y),' x=',dbgs(x),' Byte=',HexStr(Cardinal(p^),2));
{$ENDIF}
exit;
end;
@ -287,7 +287,7 @@ begin
if (p^ or UnusedByteMask)<>$ff then begin
// not all bits set -> transparent pixels found -> Mask needed
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty EdgeByte y=',y,' x=',x,' Byte=',HexStr(Cardinal(p^),2),' UnusedByteMask=',HexStr(Cardinal(UnusedByteMask),2),' UnusedBitsAtEnd=',UnusedBitsAtEnd);
DebugLn('RawImageMaskIsEmpty EdgeByte y=',dbgs(y),' x=',dbgs(x),' Byte=',HexStr(Cardinal(p^),2),' UnusedByteMask=',HexStr(Cardinal(UnusedByteMask),2),' UnusedBitsAtEnd=',dbgs(UnusedBitsAtEnd));
{$ENDIF}
exit;
end;
@ -297,13 +297,13 @@ begin
end else begin
// ToDo: AlphaSeparate and rileTight
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty TODO');
DebugLn('RawImageMaskIsEmpty TODO');
{$ENDIF}
exit;
end;
end else begin
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty TODO');
DebugLn('RawImageMaskIsEmpty TODO');
{$ENDIF}
exit;
end;
@ -311,7 +311,7 @@ begin
Result:=true;
end;
{$IFDEF VerboseRawImage}
DebugLn'RawImageMaskIsEmpty Empty=',Result);
DebugLn('RawImageMaskIsEmpty Empty=',dbgs(Result));
{$ENDIF}
end;
@ -775,6 +775,9 @@ end.
{ =============================================================================
$Log$
Revision 1.33 2004/08/13 20:40:27 mattias
fixed DebugLn for VerboseRawImage
Revision 1.32 2004/06/28 17:03:37 mattias
clean up

36
lcl/interfaces/gtk/gtkobject.inc
View File

@ -2219,7 +2219,9 @@ begin
// get intersection
ARect:=SrcRect;
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow Intersect ARect=',ARect.Left,',',ARect.Top,',',ARect.Right,',',ARect.Bottom,' DevW=',NewRawImage.Description.Width,' DevH=',NewRawImage.Description.Height);
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow Intersect ARect=',
dbgs(ARect.Left),',',dbgs(ARect.Top),',',dbgs(ARect.Right),',',dbgs(ARect.Bottom),
' DevW=',dbgs(NewRawImage.Description.Width),' DevH=',dbgs(NewRawImage.Description.Height));
{$ENDIF}
MaxRect:=Rect(0,0,NewRawImage.Description.Width,
NewRawImage.Description.Height);
@ -2228,7 +2230,9 @@ begin
NewRawImage.Description.Width:=SourceRect.Right-SourceRect.Left;
NewRawImage.Description.Height:=SourceRect.Bottom-SourceRect.Top;
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow get image ',SourceRect.Left,',',SourceRect.Top,',',SourceRect.Right,',',SourceRect.Bottom,' GDKWindow=',HexStr(Cardinal(GDkWindow),8));
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow get image ',
dbgs(SourceRect.Left),',',dbgs(SourceRect.Top),',',dbgs(SourceRect.Right),',',dbgs(SourceRect.Bottom),
' GDKWindow=',HexStr(Cardinal(GDkWindow),8));
{$ENDIF}
if (NewRawImage.Description.Width<=0) or (NewRawImage.Description.Height<=0)
then begin
@ -2258,7 +2262,8 @@ begin
NewRawImage.DataSize:=AnImage^.bpl * AnImage^.Height;
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',AnImage^.Width,' Height=',AnImage^.Height,' BitsPerPixel=',NewRawImage.Description.BitsPerPixel,' bpl=',AnImage^.bpl);
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),
' BitsPerPixel=',dbgs(NewRawImage.Description.BitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
{$ENDIF}
if NewRawImage.DataSize<>cardinal(AnImage^.bpl) * AnImage^.Height then
RaiseGDBException('NewRawImage.DataSize<>AnImage^.bpl*AnImage^.Height');
@ -2283,10 +2288,10 @@ begin
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow H ',
' Width=',NewRawImage.Description.Width,
' Height=',NewRawImage.Description.Height,
' Depth=',NewRawImage.Description.Depth,
' DataSize=',NewRawImage.DataSize);
' Width=',dbgs(NewRawImage.Description.Width),
' Height=',dbgs(NewRawImage.Description.Height),
' Depth=',dbgs(NewRawImage.Description.Depth),
' DataSize=',dbgs(NewRawImage.DataSize));
{$ENDIF}
finally
gdk_image_destroy(AnImage);
@ -2295,7 +2300,7 @@ begin
if MaskBitmap<>nil then begin
// get mask
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow get mask ',SourceRect.Left,',',SourceRect.Top,',',SourceRect.Right,',',SourceRect.Bottom,' MaskBitmap=',HexStr(Cardinal(MaskBitmap),8));
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow get mask ',dbgs(SourceRect.Left),',',dbgs(SourceRect.Top),',',dbgs(SourceRect.Right),',',dbgs(SourceRect.Bottom),' MaskBitmap=',HexStr(Cardinal(MaskBitmap),8));
{$ENDIF}
if not GetRawImageMaskFromGdkBitmap(MaskBitmap,SourceRect,NewRawImage) then
exit;
@ -2334,7 +2339,7 @@ begin
end;
try
{$IFDEF VerboseRawImage}
DebugLn('TGTKWidgetSet.GetRawImageMaskFromGdkBitmap A BytesPerLine=',AnImage^.bpl,' theType=',AnImage^.thetype,' depth=',AnImage^.depth,' BitsPerpixel=',AnImage^.bpp);
DebugLn('TGTKWidgetSet.GetRawImageMaskFromGdkBitmap A BytesPerLine=',dbgs(AnImage^.bpl),' theType=',dbgs(AnImage^.thetype),' depth=',dbgs(AnImage^.depth),' BitsPerpixel=',dbgs(AnImage^.bpp));
DebugLn('RawImage=',RawImageDescriptionAsString(@RawImage));
{$ENDIF}
@ -2353,7 +2358,7 @@ begin
RawImage.MaskSize:=AnImage^.bpl * AnImage^.Height;
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',AnImage^.Width,' Height=',AnImage^.Height,' BitsPerPixel=',RawImage.Description.AlphaBitsPerPixel,' bpl=',AnImage^.bpl);
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),' BitsPerPixel=',dbgs(RawImage.Description.AlphaBitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
{$ENDIF}
if RawImage.MaskSize<>cardinal(AnImage^.bpl) * AnImage^.Height then
RaiseGDBException('RawImage.MaskSize<>AnImage^.bpl*AnImage^.Height');
@ -2365,10 +2370,10 @@ begin
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageMaskFromGdkBitmap H ',
' Width=',RawImage.Description.Width,
' Height=',RawImage.Description.Height,
' AlphaBitsPerPixel=',RawImage.Description.AlphaBitsPerPixel,
' MaskSize=',RawImage.MaskSize);
' Width=',dbgs(RawImage.Description.Width),
' Height=',dbgs(RawImage.Description.Height),
' AlphaBitsPerPixel=',dbgs(RawImage.Description.AlphaBitsPerPixel),
' MaskSize=',dbgs(RawImage.MaskSize));
{$ENDIF}
finally
gdk_image_destroy(AnImage);
@ -9234,6 +9239,9 @@ end;
{ =============================================================================
$Log$
Revision 1.525 2004/08/13 20:40:27 mattias
fixed DebugLn for VerboseRawImage
Revision 1.524 2004/08/13 12:52:58 mattias
removed IFDEF unused var

33
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -895,17 +895,17 @@ begin
try
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.CreateBitmapFromRawImage A ',
' AlwaysCreateMask=',AlwaysCreateMask,
' Depth=',RawImage.Description.Depth,
' Width=',RawImage.Description.Width,
' Height=',RawImage.Description.Height,
' Data=',HexStr(Cardinal(RawImage.Data),8),
' DataSize=',RawImage.DataSize,
' Mask=',HexStr(Cardinal(RawImage.Mask),8),
' MaskSize=',RawImage.MaskSize,
' Palette=',HexStr(Cardinal(RawImage.Palette),8),
' PaletteSize=',RawImage.PaletteSize,
' BitsPerPixel=',RawImage.Description.BitsPerPixel,
' AlwaysCreateMask='+dbgs(AlwaysCreateMask),
' Depth='+dbgs(RawImage.Description.Depth),
' Width='+dbgs(RawImage.Description.Width),
' Height='+dbgs(RawImage.Description.Height),
' Data='+HexStr(Cardinal(RawImage.Data),8),
' DataSize='+dbgs(RawImage.DataSize)+
' Mask='+HexStr(Cardinal(RawImage.Mask),8)+
' MaskSize='+dbgs(RawImage.MaskSize)+
' Palette='+HexStr(Cardinal(RawImage.Palette),8)+
' PaletteSize='+dbgs(RawImage.PaletteSize)+
' BitsPerPixel='+dbgs(RawImage.Description.BitsPerPixel)+
'');
{$ENDIF}
@ -947,9 +947,9 @@ begin
GdkImage:=gdk_image_new(GDK_IMAGE_FASTEST,Visual,ImgWidth,ImgHeight);
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.CreateBitmapFromRawImage GdkImage: ',
' BytesPerLine=',GdkImage^.bpl,
' BytesPerPixel=',GdkImage^.bpp,
' ByteOrder=',GdkImage^.byte_order,
' BytesPerLine=',dbgs(GdkImage^.bpl),
' BytesPerPixel=',dbgs(GdkImage^.bpp),
' ByteOrder=',dbgs(GdkImage^.byte_order),
'');
{$ENDIF}
if (RawImage.Description.BitsPerPixel<>(cardinal(GdkImage^.bpp) shl 3))
@ -4687,7 +4687,7 @@ begin
DCOrigin:=GetDCOffset(TDeviceContext(SrcDC));
{$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromDevice A DCOrigin=',DCOrigin.X,',',DCOrigin.Y,' SrcRect=',SrcRect.Left,',',SrcRect.Top,',',SrcRect.Right,',',SrcRect.Bottom);
DebugLn('TGtkWidgetSet.GetRawImageFromDevice A DCOrigin=',dbgs(DCOrigin.X),',',dbgs(DCOrigin.Y),' SrcRect=',dbgs(SrcRect.Left),',',dbgs(SrcRect.Top),',',dbgs(SrcRect.Right),',',dbgs(SrcRect.Bottom));
{$ENDIF}
ARect:=SrcRect;
OffSetRect(ARect,DCOrigin.x,DCOrigin.y);
@ -8705,6 +8705,9 @@ end;
{ =============================================================================
$Log$
Revision 1.360 2004/08/13 20:40:27 mattias
fixed DebugLn for VerboseRawImage
Revision 1.359 2004/08/11 12:57:03 mattias
improved gtk1 FontCache to handle several descriptors per gdkfont