Changeset 539 for trunk/Packages/Common

Timestamp:

Apr 16, 2024, 11:43:51 AM (8 months ago)

Author:

chronos

Message:

• Modified: Optimized scaled bitmap drawing.

Location:

trunk/Packages/Common

Files:

• Languages/PixelPointer.pot (modified) (1 diff)
• PixelPointer.pas (modified) (5 diffs)

trunk/Packages/Common/Languages/PixelPointer.pot

@@ -4 +4 @@
 #: pixelpointer.soutofrange
 #, object-pascal-format
-msgid "Pixel pointer out of range [X: %d. Y: %d]"
+msgid "Pixel pointer out of range [X: %d, Y: %d, Width: %d, Height: %d]"
 msgstr ""
 

trunk/Packages/Common/PixelPointer.pas

@@ -34 +34 @@
     function GetPixelB: Byte; inline;
     function GetPixelG: Byte; inline;
-    function GetPixelPlane(Index: Byte): Byte;
+    function GetPixelPlane(Index: Byte): Byte; inline;
     function GetPixelR: Byte; inline;
     function GetPixelA: Byte; inline;
     function GetPixelPlanes: TColor32Planes;
-    function GetPixelRGB: Cardinal;
+    function GetPixelRGB: Cardinal; inline;
     procedure SetPixelARGB(Value: TColor32); inline;
     procedure SetPixelB(Value: Byte); inline;
     procedure SetPixelG(Value: Byte); inline;
-    procedure SetPixelPlane(Index: Byte; AValue: Byte);
+    procedure SetPixelPlane(Index: Byte; AValue: Byte); inline;
     procedure SetPixelR(Value: Byte); inline;
     procedure SetPixelA(Value: Byte); inline;
-    procedure SetPixelRGB(Value: Cardinal);
+    procedure SetPixelRGB(Value: Cardinal); inline;
   public
     Base: PPixel32;
@@ -63 +63 @@
     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
+    function PosValid: Boolean;
     class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; static;
     property PixelARGB: TColor32 read GetPixelARGB write SetPixelARGB;
@@ -93 +94 @@
 
 resourcestring
-  SOutOfRange = 'Pixel pointer out of range [X: %d. Y: %d]';
+  SOutOfRange = 'Pixel pointer out of range [X: %d, Y: %d, Width: %d, Height: %d]';
   SWrongBitmapSize = 'Wrong bitmap size [width: %d, height: %d]';
 
@@ -105 +106 @@
 procedure TPixel32.SetRGB(AValue: Cardinal);
 begin
-  R := (AValue shr 16) and $ff;
-  G := (AValue shr 8) and $ff;
-  B := (AValue shr 0) and $ff;
+  ARGB := (ARGB and $ff000000) or (AValue and $ffffff);
 end;
 
@@ -159 +158 @@
     X := X - Y * BytesPerLine;
     X := Floor(X / BytesPerPixel);
-    raise Exception.Create(Format(SOutOfRange, [X, Y]));
+    raise Exception.Create(Format(SOutOfRange, [X, Y, Width, Height]));
   end;
   {$ENDIF}
+end;
+
+function TPixelPointer.PosValid: Boolean;
+begin
+  Result := not ((PByte(Pixel) < PByte(Data)) or
+    (PByte(Pixel) >= PByte(Data) + Height * BytesPerLine));
 end;