From ace64d3a32b7e195bdb53ae0d5421acd641bd329 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 14 Jul 2006 22:21:17 +0000
Subject: [PATCH] changed RawImage sizes to PtrUInt

git-svn-id: trunk@9611 -
---
 lcl/alllclunits.pp               |  2 +-
 lcl/graphtype.pp                 | 50 ++++++++++++++++----------------
 lcl/interfaces/gtk/gtkobject.inc |  4 +--
 lcl/intfgraphics.pas             |  8 ++---
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lcl/alllclunits.pp b/lcl/alllclunits.pp
index ca8cced369..cd80bb8240 100644
--- a/lcl/alllclunits.pp
+++ b/lcl/alllclunits.pp
@@ -22,7 +22,7 @@ unit AllLCLUnits;
 
 { At least 2.0.2 is required }
 {$if defined(ver1) or (defined(ver2_0) and (fpc_patch<2))}
-  {$fatal Lazarus requires at least FPC 2.0.2}
+  { $fatal Lazarus requires at least FPC 2.0.2}
 {$endif}
 {$mode objfpc}{$H+}
 
diff --git a/lcl/graphtype.pp b/lcl/graphtype.pp
index f57d1c39e7..9f92b5380b 100644
--- a/lcl/graphtype.pp
+++ b/lcl/graphtype.pp
@@ -113,16 +113,16 @@ type
   TRawImage = record
     Description: TRawImageDescription;
     Data: PByte;
-    DataSize: PtrInt;
+    DataSize: PtrUInt;
     Mask: PByte;
-    MaskSize: PtrInt;
+    MaskSize: PtrUInt;
     Palette: PByte;
-    PaletteSize: cardinal;
+    PaletteSize: PtrUInt;
   end;
   PRawImage = ^TRawImage;
 
   TRawImagePosition = record
-    Byte: cardinal;
+    Byte: PtrUInt;
     Bit: cardinal;
   end;
   PRawImagePosition = ^TRawImagePosition;
@@ -166,7 +166,7 @@ procedure ReleaseRawImageData(RawImage: PRawImage);
 
 procedure CreateRawImageData(Width, Height, BitsPerPixel: cardinal;
                              LineEnd: TRawImageLineEnd;
-                             var Data: Pointer; var DataSize: PtrInt);
+                             var Data: Pointer; var DataSize: PtrUInt);
 procedure CreateRawImageLineStarts(Width, Height, BitsPerPixel: cardinal;
                                    LineEnd: TRawImageLineEnd;
                                    var LineStarts: PRawImagePosition);
@@ -180,18 +180,18 @@ procedure ExtractRawImageRect(SrcRawImage: PRawImage; const SrcRect: TRect;
 procedure ExtractRawImageDataRect(SrcRawImageDesc: PRawImageDescription;
                              const SrcRect: TRect; SrcData: Pointer;
                              DestRawImageDesc: PRawImageDescription;
-                             var DestData: Pointer; var DestDataSize: PtrInt);
+                             var DestData: Pointer; var DestDataSize: PtrUInt);
 function GetBytesPerLine(Width, BitsPerPixel: cardinal;
-                         LineEnd: TRawImageLineEnd): PtrInt;
+                         LineEnd: TRawImageLineEnd): PtrUInt;
 function GetBitsPerLine(Width, BitsPerPixel: cardinal;
-                        LineEnd: TRawImageLineEnd): PtrInt;
+                        LineEnd: TRawImageLineEnd): PtrUInt;
 procedure ReadRawImageBits(TheData: PByte; const Position: TRawImagePosition;
                        BitsPerPixel, Prec, Shift: cardinal;
                        BitOrder: TRawImageBitOrder; var Bits: word);
 procedure WriteRawImageBits(TheData: PByte; const Position: TRawImagePosition;
                        BitsPerPixel, Prec, Shift: cardinal;
                        BitOrder: TRawImageBitOrder; Bits: word);
-procedure ReAlignRawImageLines(var Data: Pointer; var Size: PtrInt;
+procedure ReAlignRawImageLines(var Data: Pointer; var Size: PtrUInt;
   Width, Height: cardinal;
   var OldLineEnd: TRawImageLineEnd; NewLineEnd: TRawImageLineEnd);
 
@@ -271,7 +271,7 @@ begin
       BitsPerLine:=GetBitsPerLine(Width,RawImage^.Description.AlphaBitsPerPixel,
                                   RawImage^.Description.AlphaLineEnd);
       UsedBitsPerLine:=Width*RawImage^.Description.AlphaBitsPerPixel;
-      if RawImage^.MaskSize<PtrInt((Height*BitsPerLine+7) shr 3) then
+      if RawImage^.MaskSize<PtrUInt((Height*BitsPerLine+7) shr 3) then
         raise Exception.Create('RawImageMaskIsEmpty Invalid MaskSize');
       if (BitsPerLine and 7)=0 then begin
         // byte boundary
@@ -404,10 +404,10 @@ end;
 
 -------------------------------------------------------------------------------}
 procedure CreateRawImageData(Width, Height, BitsPerPixel: cardinal;
-  LineEnd: TRawImageLineEnd; var Data: Pointer; var DataSize: PtrInt);
+  LineEnd: TRawImageLineEnd; var Data: Pointer; var DataSize: PtrUInt);
 var
-  PixelCount: PtrInt;
-  BitsPerLine: PtrInt;
+  PixelCount: PtrUInt;
+  BitsPerLine: PtrUInt;
   DataBits: Int64;
 begin
   // get current size
@@ -497,7 +497,7 @@ end;
 procedure ExtractRawImageDataRect(SrcRawImageDesc: PRawImageDescription;
   const SrcRect: TRect; SrcData: Pointer;
   DestRawImageDesc: PRawImageDescription;
-  var DestData: Pointer; var DestDataSize: PtrInt);
+  var DestData: Pointer; var DestDataSize: PtrUInt);
 var
   SrcWidth: cardinal;
   SrcHeight: cardinal;
@@ -514,7 +514,7 @@ var
   Shift: LongWord;
   SrcPos: PByte;
   DestPos: PByte;
-  ByteCount: PtrInt;
+  ByteCount: PtrUInt;
   x: Integer;
 begin
   // init
@@ -632,15 +632,15 @@ begin
 end;
 
 function GetBytesPerLine(Width, BitsPerPixel: cardinal;
-  LineEnd: TRawImageLineEnd): PtrInt;
+  LineEnd: TRawImageLineEnd): PtrUInt;
 begin
   Result:=(GetBitsPerLine(Width,BitsPerPixel,LineEnd)+7) shr 3;
 end;
 
 function GetBitsPerLine(Width, BitsPerPixel: cardinal;
-                        LineEnd: TRawImageLineEnd): PtrInt;
+                        LineEnd: TRawImageLineEnd): PtrUInt;
 var
-  BitsPerLine: PtrInt;
+  BitsPerLine: PtrUInt;
 begin
   BitsPerLine:=Width*BitsPerPixel;
   case LineEnd of
@@ -757,14 +757,14 @@ begin
   end;
 end;
 
-procedure ReAlignRawImageLines(var Data: Pointer; var Size: PtrInt;
+procedure ReAlignRawImageLines(var Data: Pointer; var Size: PtrUInt;
   Width, Height: cardinal;
   var OldLineEnd: TRawImageLineEnd; NewLineEnd: TRawImageLineEnd);
 var
-  OldBytesPerLine: PtrInt;
-  OldSize: PtrInt;
-  NewBytesPerLine: PtrInt;
-  NewSize: PtrInt;
+  OldBytesPerLine: PtrUInt;
+  OldSize: PtrUInt;
+  NewBytesPerLine: PtrUInt;
+  NewSize: PtrUInt;
   y: Integer;
   OldPos: Pointer;
   NewPos: Pointer;
@@ -772,11 +772,11 @@ begin
   if OldLineEnd=NewLineEnd then exit;
   if (Width=0) or (Height=0) then exit;
   OldBytesPerLine:=GetBytesPerLine(Width,Height,OldLineEnd);
-  OldSize:=OldBytesPerLine*PtrInt(Height);
+  OldSize:=OldBytesPerLine*PtrUInt(Height);
   if OldSize<>Size then
     RaiseGDBException('ReAlignRawImageLines OldSize<>Size');
   NewBytesPerLine:=GetBytesPerLine(Width,Height,OldLineEnd);
-  NewSize:=NewBytesPerLine*PtrInt(Height);
+  NewSize:=NewBytesPerLine*PtrUInt(Height);
   
   // enlarge before
   if OldSize<NewSize then
diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index b84fbb4d0b..b5f98c8361 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -2730,7 +2730,7 @@ begin
     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<>PtrInt(AnImage^.bpl) * PtrInt(AnImage^.Height)
+    if NewRawImage.DataSize<>PtrUInt(AnImage^.bpl) * PtrUInt(AnImage^.Height)
     then
       RaiseGDBException('NewRawImage.DataSize<>AnImage^.bpl*AnImage^.Height');
 
@@ -2841,7 +2841,7 @@ begin
     {$IFDEF VerboseRawImage}
     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<>PtrInt(AnImage^.bpl) * PtrInt(AnImage^.Height)
+    if RawImage.MaskSize<>PtrUInt(AnImage^.bpl) * PtrUInt(AnImage^.Height)
     then
       RaiseGDBException('RawImage.MaskSize<>AnImage^.bpl*AnImage^.Height');
 
diff --git a/lcl/intfgraphics.pas b/lcl/intfgraphics.pas
index af046c8b8c..08246704bc 100644
--- a/lcl/intfgraphics.pas
+++ b/lcl/intfgraphics.pas
@@ -117,9 +117,9 @@ type
     FAutoCreateMask: boolean;
     FDataDescription: TRawImageDescription;
     FPixelData: PByte;
-    FPixelDataSize: PtrInt;
+    FPixelDataSize: PtrUInt;
     FMaskData: PByte;
-    FMaskDataSize: PtrInt;
+    FMaskDataSize: PtrUInt;
     FLineStarts: PRawImagePosition;
     FMaskLineStarts: PRawImagePosition;
     FUpdateCount: integer;
@@ -143,7 +143,7 @@ type
     procedure FreeAllData; virtual;
     procedure FreePixelData; virtual;
     procedure FreeMaskData; virtual;
-    procedure CreateDataAndLineStarts(var Data: Pointer; var DataSize: PtrInt;
+    procedure CreateDataAndLineStarts(var Data: Pointer; var DataSize: PtrUInt;
                                       var TheLineStarts: PRawImagePosition;
                                       TheBitsPerPixel: cardinal;
                                       TheLineEnd: TRawImageLineEnd); virtual;
@@ -1568,7 +1568,7 @@ begin
 end;
 
 procedure TLazIntfImage.CreateDataAndLineStarts(var Data: Pointer;
-  var DataSize: PtrInt; var TheLineStarts: PRawImagePosition;
+  var DataSize: PtrUInt; var TheLineStarts: PRawImagePosition;
   TheBitsPerPixel: cardinal; TheLineEnd: TRawImageLineEnd);
 begin
   CreateRawImageLineStarts(Width,Height,TheBitsPerPixel,TheLineEnd,