From e059141fb3ec761ae2ebdccd94b94e1c715c1ffa Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 13 Aug 2004 21:46:31 +0000
Subject: [PATCH] added TLazIntfImage.SetColor_BPP32_R8G8B8_A1_BIO_TTB_RBO

git-svn-id: trunk@5786 -
---
 lcl/interfaces/gtk/gtkobject.inc |  5 +++-
 lcl/intfgraphics.pas             | 41 ++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 1ccff628be..f9211a82d3 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -2161,7 +2161,7 @@ begin
   // LineEnd
   case Desc^.Depth of
   0..8:   Desc^.LineEnd:=rileByteBoundary;
-  9..32:  Desc^.LineEnd:=rileDWordBoundary; //TODO MWE: Isn't there a word boundary (9..16) ?
+  9..32:  Desc^.LineEnd:=rileDWordBoundary; // On X11 i386 lines are never aligned to words, only to dwords
   else    Desc^.LineEnd:=rileQWordBoundary;
   end;
   // Precisions and Shifts
@@ -9239,6 +9239,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.526  2004/08/13 21:46:31  mattias
+  added TLazIntfImage.SetColor_BPP32_R8G8B8_A1_BIO_TTB_RBO
+
   Revision 1.525  2004/08/13 20:40:27  mattias
   fixed DebugLn for VerboseRawImage
 
diff --git a/lcl/intfgraphics.pas b/lcl/intfgraphics.pas
index b66614fdf3..0c0908a219 100644
--- a/lcl/intfgraphics.pas
+++ b/lcl/intfgraphics.pas
@@ -168,7 +168,8 @@ type
     procedure SetColor_NoPalette_RGBA_NoAlpha(x, y: integer; const Value: TFPColor);
     procedure SetColor_NoPalette_Gray(x, y: integer; const Value: TFPColor);
     procedure SetColor_NULL(x, y: integer; const Value: TFPColor);
-    procedure SetColor_BPP32_R8G8B8_A1_BIO_LSB_TTB(x, y: integer; const Value: TFPColor);
+    procedure SetColor_BPP32_R8G8B8_A1_BIO_TTB(x, y: integer; const Value: TFPColor);
+    procedure SetColor_BPP32_R8G8B8_A1_BIO_TTB_RBO(x, y: integer; const Value: TFPColor);
   public
     constructor Create(AWidth, AHeight: integer); override;
     destructor Destroy; override;
@@ -985,13 +986,16 @@ procedure TLazIntfImage.ChooseGetSetColorFunctions;
           OnSetInternalColor:=@SetColor_NoPalette_RGBA_Alpha_Sep_Mask;
           with FDataDescription do begin
             if (BitsPerPixel=32) and (Depth=24) and (BitOrder=riboBitsInOrder)
-            and (ByteOrder=riboLSBFirst) and (LineOrder=riloTopToBottom)
+            and (ByteOrder=DefaultByteOrder) and (LineOrder=riloTopToBottom)
             and (LineEnd=rileDWordBoundary)
             and (RedPrec=8) and (RedShift=16)
             and (GreenPrec=8) and (GreenShift=8)
             and (BluePrec=8) and (BlueShift=0)
             then begin
-              OnSetInternalColor:=@SetColor_BPP32_R8G8B8_A1_BIO_LSB_TTB;
+              if ByteOrder=DefaultByteOrder then
+                OnSetInternalColor:=@SetColor_BPP32_R8G8B8_A1_BIO_TTB
+              else
+                OnSetInternalColor:=@SetColor_BPP32_R8G8B8_A1_BIO_TTB_RBO;
             end;
           end;
         end else begin
@@ -1357,10 +1361,11 @@ begin
   // NULL, not implemented
 end;
 
-procedure TLazIntfImage.SetColor_BPP32_R8G8B8_A1_BIO_LSB_TTB(x, y: integer;
+procedure TLazIntfImage.SetColor_BPP32_R8G8B8_A1_BIO_TTB(x, y: integer;
   const Value: TFPColor);
 // Format=ricfRGBA HasPalette=false Depth=24 PaletteColorCount=0
-// BitOrder=riboBitsInOrder ByteOrder=riboLSBFirst LineOrder=riloTopToBottom
+// BitOrder=riboBitsInOrder ByteOrder=DefaultByteOrder
+// LineOrder=riloTopToBottom
 // BitsPerPixel=32 LineEnd=rileDWordBoundary
 // RedPrec=8 RedShift=16 GreenPrec=8 GreenShift=8 BluePrec=8 BlueShift=0
 // AlphaSeparate=true
@@ -1382,6 +1387,32 @@ begin
                 Value.Alpha);
 end;
 
+procedure TLazIntfImage.SetColor_BPP32_R8G8B8_A1_BIO_TTB_RBO(x, y: integer;
+  const Value: TFPColor);
+// Format=ricfRGBA HasPalette=false Depth=24 PaletteColorCount=0
+// BitOrder=riboBitsInOrder ByteOrder=not DefaultByteOrder
+// LineOrder=riloTopToBottom
+// BitsPerPixel=32 LineEnd=rileDWordBoundary
+// RedPrec=8 RedShift=16 GreenPrec=8 GreenShift=8 BluePrec=8 BlueShift=0
+// AlphaSeparate=true
+var
+  MaskPosition: TRawImagePosition;
+  Position: PCardinal;
+  Pixel: Cardinal;
+begin
+  Position:=PCardinal(FPixelData+FLineStarts[y].Byte+(x shl 2));
+  Pixel:=(Value.Red shr 8)
+         +((Value.Green shr 8) shl 8)
+         +((Value.Blue shr 8) shl 16);
+  Position^:=Pixel;
+
+  GetXYMaskPostion(x,y,MaskPosition);
+  FAlphaWriteRawImageBits(FMaskData,MaskPosition,
+                FDataDescription.AlphaPrec,
+                FDataDescription.AlphaShift,
+                Value.Alpha);
+end;
+
 procedure TLazIntfImage.SetAutoCreateMask(const AValue: boolean);
 begin
   if FAutoCreateMask=AValue then exit;