Changeset 494 for GraphicTest/Packages/bgrabitmap/bgragtkbitmap.pas

Timestamp:

Dec 22, 2016, 8:49:19 PM (7 years ago)

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgragtkbitmap.pas (modified) (8 diffs)

GraphicTest/Packages/bgrabitmap/bgragtkbitmap.pas

@@ -28 +28 @@
 
 uses
-  Classes, SysUtils, BGRADefaultBitmap, Graphics,
+  Classes, SysUtils, BGRALCLBitmap, Graphics,
   GraphType;
 
@@ -34 +34 @@
   { TBGRAGtkBitmap }
 
-  TBGRAGtkBitmap = class(TBGRADefaultBitmap)
+  TBGRAGtkBitmap = class(TBGRALCLBitmap)
   private
     FPixBuf: Pointer;
-{    procedure SlowDrawTransparent(ABitmap: TBGRADefaultBitmap;
-      ACanvas: TCanvas; ARect: TRect);}
     procedure DrawTransparent(ACanvas: TCanvas; Rect: TRect);
     procedure DrawOpaque(ACanvas: TCanvas; Rect: TRect);
@@ -57 +55 @@
 implementation
 
-uses BGRABitmapTypes, LCLType,
+uses BGRABitmapTypes, BGRADefaultBitmap, LCLType,
   LCLIntf, IntfGraphics,
   {$IFDEF LCLgtk2}
@@ -70 +68 @@
 type TGtkDeviceContext = TGtk2DeviceContext;
 {$ENDIF}
-
-{procedure TBGRAGtkBitmap.SlowDrawTransparent(ABitmap: TBGRADefaultBitmap;
-  ACanvas: TCanvas; ARect: TRect);
-var
-  background, temp: TBGRACustomBitmap;
-  w, h: integer;
-
-begin
-  w := ARect.Right - ARect.Left;
-  h := ARect.Bottom - ARect.Top;
-  background := NewBitmap(w, h);
-  background.GetImageFromCanvas(ACanvas, ARect.Left, ARect.Top);
-  if (ABitmap.Width = w) and (ABitmap.Height = h) then
-    background.PutImage(0, 0, ABitmap, dmDrawWithTransparency)
-  else
-  begin
-    temp := ABitmap.Resample(w, h, rmSimpleStretch);
-    background.PutImage(0, 0, temp, dmDrawWithTransparency);
-    temp.Free;
-  end;
-  background.Draw(ACanvas, ARect.Left, ARect.Top, True);
-  background.Free;
-end;}
 
 procedure TBGRAGtkBitmap.ReallocData;
@@ -141 +116 @@
   end;
 
-  SwapRedBlue;
+  If not TBGRAPixel_RGBAOrder then SwapRedBlue;
   
   P := Rect.TopLeft;
@@ -152 +127 @@
     GDK_RGB_DITHER_NORMAL,0,0);   
 
-  SwapRedBlue;
+  If not TBGRAPixel_RGBAOrder then SwapRedBlue;
 end;
 
@@ -252 +227 @@
   LPtoDP(dest, pos, 1);
   If ALineOrder = riloBottomToTop then VerticalFlip;
-  SwapRedBlue;
+  If not TBGRAPixel_RGBAOrder then SwapRedBlue;
   gdk_draw_rgb_32_image(TGtkDeviceContext(dest).Drawable,
     TGtkDeviceContext(Dest).GC, pos.x,pos.y,
     AWidth,AHeight, GDK_RGB_DITHER_NORMAL,
     AData, AWidth*sizeof(TBGRAPixel));
-  SwapRedBlue;
+  If not TBGRAPixel_RGBAOrder then SwapRedBlue;
   If ALineOrder = riloBottomToTop then VerticalFlip;
 end;
@@ -297 +272 @@
     TGtkDeviceContext(CanvasSource.Handle).Drawable,
     nil, P.X,P.Y,0,0,Width,Height);
-  SwapRedBlue;
+  If not TBGRAPixel_RGBAOrder then SwapRedBlue;
   InvalidateBitmap;
 end;