Changeset 501 for trunk/Packages/DpiControls

Timestamp:

Dec 23, 2023, 11:11:19 AM (11 months ago)

Author:

chronos

Message:

• Fixed: TPixelPointer range check.

File:

• trunk/Packages/DpiControls/Dpi.PixelPointer.pas (modified) (3 diffs)

trunk/Packages/DpiControls/Dpi.PixelPointer.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Dpi.Graphics, Dpi.Common;
+  Math, Classes, SysUtils, Dpi.Graphics, Dpi.Common;
 
 type
@@ -68 +68 @@
 
 resourcestring
-  SOutOfRange = 'Pixel pointer out of range';
+  SOutOfRange = 'Pixel pointer out of range [X: %d. Y: %d]';
   SWrongBitmapSize = 'Wrong bitmap size [width: %d, height: %d]';
 
@@ -126 +126 @@
 
 procedure TPixelPointer.CheckRange;
+var
+  X: Integer;
+  Y: Integer;
 begin
   {$IFOPT R+}
   if (PByte(Pixel) < PByte(Data)) or
-    (PByte(Pixel) >= PByte(Data) + (Width + Height * BytesPerLine) * BytesPerPixel) then
-    raise Exception.Create(SOutOfRange);
+    (PByte(Pixel) >= PByte(Data) + Height * BytesPerLine + BytesPerLine) then begin
+    X := PByte(Pixel) - PByte(Data);
+    Y := Floor(X / BytesPerLine);
+    X := X - Y * BytesPerLine;
+    X := Floor(X / BytesPerPixel);
+    raise Exception.Create(Format(SOutOfRange, [X, Y]));
+  end;
   {$ENDIF}
 end;