Changeset 349 for branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/Packages/CevoComponents/UPixelPointer.pas (modified) (4 diffs)

branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

@@ -13 +13 @@
 
   TPixel32 = packed record
-    procedure SetRGB(Color: TColor32);
-    function GetRGB: TColor32;
+  private
+    function GetRGB: Cardinal;
+    procedure SetRGB(AValue: Cardinal);
+  public
+    property RGB: Cardinal read GetRGB write SetRGB;
     case Integer of
       0: (B, G, R, A: Byte);
@@ -42 +45 @@
 
   function PixelPointer(Bitmap: TDpiRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
+  function SwapRedBlue(Color: TColor32): TColor32;
   function Color32ToColor(Color: TColor32): TColor;
   function ColorToColor32(Color: TColor): TColor32;
-
 
 implementation
@@ -50 +53 @@
 { TPixel32 }
 
-procedure TPixel32.SetRGB(Color: TColor32);
+function TPixel32.GetRGB: Cardinal;
 begin
-  B := Color and $ff;
-  G := (Color shr 8) and $ff;
-  R := (Color shr 16) and $ff;
+  Result := ARGB and $ffffff;
 end;
 
-function TPixel32.GetRGB: TColor32;
+procedure TPixel32.SetRGB(AValue: Cardinal);
 begin
-  Result := ARGB and $ffffff;
+  R := (AValue shr 16) and $ff;
+  G := (AValue shr 8) and $ff;
+  B := (AValue shr 0) and $ff;
 end;
 
@@ -107 +110 @@
 end;
 
+function SwapRedBlue(Color: TColor32): TColor32;
+begin
+  Result := (Color and $ff00ff00) or ((Color and $ff) shl 16) or ((Color shr 16) and $ff);
+end;
+
 function Color32ToColor(Color: TColor32): TColor;
 begin