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

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgrareadico.pas (modified) (5 diffs)

GraphicTest/Packages/bgrabitmap/bgrareadico.pas

@@ -2 +2 @@
 
 {$mode objfpc}{$H+}
+{$i bgrabitmap.inc}
 
 interface
@@ -14 +15 @@
   TBGRAReaderIco = class(TFPCustomImageReader)
   protected
-    procedure InternalRead(Str: TStream; Img: TFPCustomImage); override;
+    procedure InternalRead({%H-}Str: TStream; {%H-}Img: TFPCustomImage); override;
     function InternalCheck(Str: TStream): boolean; override;
   public
@@ -22 +23 @@
 implementation
 
-uses BGRABitmapTypes, Graphics;
+uses BGRABitmapTypes{$IFDEF BGRABITMAP_USE_LCL}, Graphics{$ENDIF};
 
 { TBGRAReaderIco }
 
 procedure TBGRAReaderIco.InternalRead(Str: TStream; Img: TFPCustomImage);
+{$IFDEF BGRABITMAP_USE_LCL}
 var ico: TIcon; i,bestIdx: integer;
     height,width: word; format:TPixelFormat;
@@ -57 +59 @@
     begin
       ico.Current := bestIdx;
-      with Img as TBGRACustomBitmap do
-      begin
-        SetSize(bestWidth,bestHeight);
-        GetImageFromCanvas(ico.Canvas,0,0);
-      end;
+      (Img as TBGRACustomBitmap).Assign(ico);
     end;
   finally
@@ -67 +65 @@
   end;
 end;
+{$ELSE}
+begin
+  raise exception.create('Not implemented');
+end;
+{$ENDIF}
 
 function TBGRAReaderIco.InternalCheck(Str: TStream): boolean;