GetColor functions shouldn't return alpha channel

Villavu · Jan 3, 2024 · 04bc741 · 04bc741
1 parent 4c2c155
commit 04bc741
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/Source/colormath/simba.colormath_conversion.pas b/Source/colormath/simba.colormath_conversion.pas
@@ -9,11 +9,6 @@
 }
 unit simba.colormath_conversion;
 
-{$DEFINE B_BIT := 16}
-{$DEFINE G_BIT := 8}
-{$DEFINE R_BIT := 0}
-{$DEFINE A_BIT := 24}
-
 {$DEFINE SIMBA_MAX_OPTIMIZATION}
 
 {$i simba.inc}

diff --git a/Source/simba.finder.pas b/Source/simba.finder.pas
@@ -13,8 +13,9 @@ interface
 
 uses
   Classes, SysUtils, Graphics,
-  simba.mufasatypes, simba.colormath, simba.colormath_distance, simba.image,
-  simba.dtm, simba.target;
+  simba.mufasatypes,
+  simba.colormath, simba.colormath_distance, simba.colormath_conversion,
+  simba.image, simba.dtm, simba.target;
 
 type
   PColorTolerance = ^TColorTolerance;
@@ -212,7 +213,7 @@ function TSimbaFinder.GetColor(X, Y: Integer): TColor;
 
   if FTarget.GetImageData(B, Data, DataWidth) then
   try
-    Result := Data^.ToColor()
+    Result := Data^.R or Data^.G shl G_BIT or Data^.B shl B_BIT;
   finally
     FTarget.FreeImageData(Data);
   end;
@@ -223,7 +224,8 @@ function TSimbaFinder.GetColors(Points: TPointArray): TColorArray;
   B: TBox;
   Data: PColorBGRA;
   DataWidth: Integer;
-  I, X, Y, Count: Integer;
+  I, Count: Integer;
+  Pixel: TColorBGRA;
 begin
   Result := nil;
 
@@ -235,10 +237,9 @@ function TSimbaFinder.GetColors(Points: TPointArray): TColorArray;
     Count := 0;
     for I := 0 to High(Points) do
     begin
-      X := Points[I].X - B.X1;
-      Y := Points[I].Y - B.Y1;
+      Pixel := Data[(Points[I].Y - B.Y1) * DataWidth + (Points[I].X - B.X1)];
 
-      Result[Count] := Data[Y * DataWidth + X].ToColor();
+      Result[Count] := Pixel.R or Pixel.G shl G_BIT or Pixel.B shl B_BIT;
       Inc(Count);
     end;
     SetLength(Result, Count);
@@ -252,6 +253,7 @@ function TSimbaFinder.GetColorsMatrix(Bounds: TBox): TIntegerMatrix;
   Data: PColorBGRA;
   DataWidth: Integer;
   Width, Height, X, Y: Integer;
+  Pixel: TColorBGRA;
 begin
   Result := nil;
 
@@ -264,7 +266,11 @@ function TSimbaFinder.GetColorsMatrix(Bounds: TBox): TIntegerMatrix;
 
     for Y := 0 to Height do
       for X := 0 to Width do
-        Result[Y, X] := Data[Y * DataWidth + X].ToColor();
+      begin
+        Pixel := Data[Y * DataWidth + X];
+
+        Result[Y, X] := Pixel.R or Pixel.G shl G_BIT or Pixel.B shl B_BIT;
+      end;
   finally
     FTarget.FreeImageData(Data);
   end;

diff --git a/Source/simba.inc b/Source/simba.inc
@@ -47,6 +47,12 @@
   {$DEFINE LAPE_WRAPPER_CALLING_CONV := cdecl;}
 {$ENDIF}
 
+// bitshifts for color channels
+{$DEFINE A_BIT := 24}
+{$DEFINE B_BIT := 16}
+{$DEFINE G_BIT := 8}
+{$DEFINE R_BIT := 0}
+
 {.$DEFINE PARSER_BENCHMARK}
 {.$DEFINE PARSER_CACHE_DEBUG}
 {.$DEFINE PARSER_LEAK_CHECKS}