Changeset 487 for trunk/Packages/DpiControls/Dpi.Graphics.pas

Timestamp:

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

Author:

chronos

Message:

• Added: Range checking for TPixelPointer record type.

File:

• trunk/Packages/DpiControls/Dpi.Graphics.pas (modified) (5 diffs)

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 }