Changeset 487 for trunk/Packages

Timestamp:

Dec 8, 2023, 11:39:45 PM (11 months ago)

Author:

chronos

Message:

• Added: Range checking for TPixelPointer record type.

Location:

trunk/Packages

Files:

• Common/Languages/PixelPointer.pot (added)
• Common/PixelPointer.pas (modified) (5 diffs)
• DpiControls/Dpi.Graphics.pas (modified) (5 diffs)
• DpiControls/Dpi.PixelPointer.pas (modified) (10 diffs)
• DpiControls/NativePixelPointer.pas (modified) (4 diffs)

trunk/Packages/Common/PixelPointer.pas

@@ -35 +35 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
+    Data: PPixel32;
+    Width: Integer;
+    Height: Integer;
     procedure NextLine; inline; // Move pointer to start of next line
     procedure PreviousLine; inline; // Move pointer to start of previous line
@@ -41 +44 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
-    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline; static;
+    procedure CheckRange; inline; // Check if current pixel position is not out of range
+    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; static;
   end;
   PPixelPointer = ^TPixelPointer;
@@ -63 +67 @@
 implementation
 
+resourcestring
+  SOutOfRange = 'Pixel pointer out of range';
+  SWrongBitmapSize = 'Wrong bitmap size [width: %d, height: %d]';
+
 { TPixel32 }
 
@@ -110 +118 @@
 begin
   Pixel := Pointer(Line) + X * BytesPerPixel;
+end;
+
+procedure TPixelPointer.CheckRange;
+begin
+  {$IFOPT R+}
+  if (PByte(Pixel) < PByte(Data)) or
+    (PByte(Pixel) >= PByte(Data) + (Width + Height * BytesPerLine) * BytesPerPixel) then
+    raise Exception.Create(SOutOfRange);
+  {$ENDIF}
 end;
 
@@ -298 +315 @@
   BaseY: Integer): TPixelPointer;
 begin
+  Result.Width := Bitmap.Width;
+  Result.Height := Bitmap.Height;
+  if (Result.Width < 0) or (Result.Height < 0) then
+    raise Exception.Create(Format(SWrongBitmapSize, [Result.Width, Result.Height]));
   Result.BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
   Result.BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Result.Data := PPixel32(Bitmap.RawImage.Data);
   Result.Base := PPixel32(Bitmap.RawImage.Data + BaseX * Result.BytesPerPixel +
     BaseY * Result.BytesPerLine);

trunk/Packages/DpiControls/Dpi.Graphics.pas

@@ -270 +270 @@
     procedure ScreenChanged; override;
   public
+    procedure Assign(Source: TPersistent); override;
     procedure SetSize(AWidth, AHeight: Integer); override;
   end;
@@ -293 +294 @@
     constructor Create; override;
     destructor Destroy; override;
-    procedure Assign(Source: TPersistent); override;
     property ScanLine[Row: Integer]: Pointer read GetScanLine;
   published
@@ -418 +418 @@
 end;
 
+procedure TCustomBitmap.Assign(Source: TPersistent);
+begin
+  if Source is TCustomBitmap then begin
+    GetNativeCustomBitmap.Assign(TCustomBitmap(Source).GetNativeCustomBitmap);
+    FWidth := TCustomBitmap(Source).FWidth;
+    FHeight := TCustomBitmap(Source).FHeight
+  end else inherited;
+end;
+
 procedure TCustomBitmap.SetSize(AWidth, AHeight: Integer);
 begin
@@ -691 +700 @@
   //Exit;
   Dst.BeginUpdate;
-  SrcPtr := PixelPointer(Src, 0, 0);
-  DstPtr := PixelPointer(Dst, 0, 0);
+  SrcPtr := TPixelPointer.Create(Src, 0, 0);
+  DstPtr := TPixelPointer.Create(Dst, 0, 0);
   {for yy := 0 to Dst.Height - 1 do begin
     for xx := 0 to Dst.Width - 1 do begin
@@ -841 +850 @@
 end;
 
-procedure TBitmap.Assign(Source: TPersistent);
-begin
-  if Source is TBitmap then begin
-    GetNativeBitmap.Assign((Source as TBitmap).GetNativeBitmap);
-  end else inherited;
-end;
-
 { TPen }
 

trunk/Packages/DpiControls/Dpi.PixelPointer.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Dpi.Graphics;
+  Classes, SysUtils, Dpi.Graphics, Dpi.Common;
 
 type
@@ -35 +35 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
+    Data: PPixel32;
+    Width: Integer;
+    Height: Integer;
     procedure NextLine; inline; // Move pointer to start of next line
     procedure PreviousLine; inline; // Move pointer to start of previous line
@@ -41 +44 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
-    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline; static;
+    procedure CheckRange; inline; // Check if current pixel position is not out of range
+    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; static;
   end;
   PPixelPointer = ^TPixelPointer;
@@ -63 +67 @@
 implementation
 
+resourcestring
+  SOutOfRange = 'Pixel pointer out of range';
+  SWrongBitmapSize = 'Wrong bitmap size [width: %d, height: %d]';
+
 { TPixel32 }
 
@@ -83 +91 @@
   Line := Pointer(Line) + BytesPerLine;
   Pixel := Line;
+  CheckRange;
 end;
 
@@ -89 +98 @@
   Line := Pointer(Line) - BytesPerLine;
   Pixel := Line;
+  CheckRange;
 end;
 
@@ -94 +104 @@
 begin
   Pixel := Pointer(Pixel) + BytesPerPixel;
+  CheckRange;
 end;
 
@@ -99 +110 @@
 begin
   Pixel := Pointer(Pixel) - BytesPerPixel;
+  CheckRange;
 end;
 
@@ -110 +122 @@
 begin
   Pixel := Pointer(Line) + X * BytesPerPixel;
+  CheckRange;
+end;
+
+procedure TPixelPointer.CheckRange;
+begin
+  {$IFOPT R+}
+  if (PByte(Pixel) < PByte(Data)) or
+    (PByte(Pixel) >= PByte(Data) + (Width + Height * BytesPerLine) * BytesPerPixel) then
+    raise Exception.Create(SOutOfRange);
+  {$ENDIF}
 end;
 
@@ -298 +320 @@
   BaseY: Integer): TPixelPointer;
 begin
+  Result.Width := ScaleToNative(Bitmap.Width);
+  Result.Height := ScaleToNative(Bitmap.Height);
+  if (Result.Width < 0) or (Result.Height < 0) then
+    raise Exception.Create(Format(SWrongBitmapSize, [Result.Width, Result.Height]));
   Result.BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
   Result.BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Result.Data := PPixel32(Bitmap.RawImage.Data);
   Result.Base := PPixel32(Bitmap.RawImage.Data + BaseX * Result.BytesPerPixel +
     BaseY * Result.BytesPerLine);

trunk/Packages/DpiControls/NativePixelPointer.pas

@@ -32 +32 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
+    Data: PPixel32;
+    Width: Integer;
+    Height: Integer;
     procedure NextLine; inline; // Move pointer to start of next line
     procedure PreviousLine; inline; // Move pointer to start of previous line
@@ -38 +41 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
+    procedure CheckRange; inline; // Check if current pixel position is not out of range
+    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; static;
   end;
   PPixelPointer = ^TPixelPointer;
 
-  function PixelPointer(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
   function Color32ToColor(Color: TColor32): TColor;
   function ColorToColor32(Color: TColor): TColor32;
@@ -48 +52 @@
 implementation
 
-{ TPixel32 }
+resourcestring
+  SOutOfRange = 'Pixel pointer out of range';
+  SWrongBitmapSize = 'Wrong bitmap size [width: %d, height: %d]';
+
+  { TPixel32 }
 
 procedure TPixel32.SetRGB(Color: TColor32);
@@ -97 +105 @@
 end;
 
-function PixelPointer(Bitmap: TRasterImage; BaseX: Integer;
+procedure TPixelPointer.CheckRange;
+begin
+  {$IFOPT R+}
+  if (PByte(Pixel) < PByte(Data)) or
+    (PByte(Pixel) >= PByte(Data) + (Width + Height * BytesPerLine) * BytesPerPixel) then
+    raise Exception.Create(SOutOfRange);
+  {$ENDIF}
+end;
+
+class function TPixelPointer.Create(Bitmap: TRasterImage; BaseX: Integer;
   BaseY: Integer): TPixelPointer;
 begin
+  Result.Width := Bitmap.Width;
+  Result.Height := Bitmap.Height;
+  if (Result.Width < 0) or (Result.Height < 0) then
+    raise Exception.Create(Format(SWrongBitmapSize, [Result.Width, Result.Height]));
   Result.BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
   Result.BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Result.Data := PPixel32(Bitmap.RawImage.Data);
   Result.Base := PPixel32(Bitmap.RawImage.Data + BaseX * Result.BytesPerPixel +
     BaseY * Result.BytesPerLine);