Changeset 29 for trunk/Packages

Timestamp:

Dec 22, 2016, 9:46:17 PM (8 years ago)

Author:

chronos

Message:

• Modified: Load image data from file quickly using Bitmap RawImage.
• Modified: Remember last selected color format.

Location:

trunk/Packages

Files:

• Common/Languages/UJobProgressView.cs.po (modified) (1 diff)
• FastGraphics/ColorFormats/UColorRGB8.pas (modified) (2 diffs)
• FastGraphics/UFGraphics.pas (modified) (4 diffs)
• FastGraphics/UGGraphics.pas (modified) (3 diffs)

trunk/Packages/Common/Languages/UJobProgressView.cs.po

@@ -39 +39 @@
 msgid "Total estimated time: %s"
 msgstr "CelkovÜ odhadovanÜ čas: %s"
+

trunk/Packages/FastGraphics/ColorFormats/UColorRGB8.pas

@@ -56 +56 @@
     procedure PaintToBitmap(Bitmap: TBitmap; Rect: TRect); override;
     procedure LoadFromCanvas(Canvas: TCanvas); override;
+    procedure LoadFromBitmap(Bitmap: TBitmap); override;
     function GetDataSize: Integer; override;
     constructor Create; override;
@@ -170 +171 @@
 end;
 
+procedure TBPixmapRGB8.LoadFromBitmap(Bitmap: TBitmap);
+begin
+  Pixmap.LoadFromBitmap(Bitmap, Pixmap.ColorToRGB8);
+end;
+
 function TBPixmapRGB8.GetDataSize: Integer;
 begin

trunk/Packages/FastGraphics/UFGraphics.pas

@@ -45 +45 @@
     procedure PaintToBitmap(Bitmap: TBitmap; Rect: TRect); virtual;
     procedure LoadFromCanvas(Canvas: TCanvas); virtual;
+    procedure LoadFromBitmap(Bitmap: TBitmap); virtual;
     function GetDataSize: Integer; virtual;
     constructor Create; virtual;
@@ -174 +175 @@
     procedure PaintToBitmap(Bitmap: TBitmap; Rect: TRect); overload;
     procedure LoadFromCanvas(Canvas: TCanvas);
+    procedure LoadFromBitmap(Bitmap: TBitmap);
     function GetDataSize: Integer;
     constructor Create(AOwner: TComponent); override;
@@ -383 +385 @@
 end;
 
+procedure TBImage.LoadFromBitmap(Bitmap: TBitmap);
+begin
+end;
+
 function TBImage.GetDataSize: Integer;
 begin
@@ -495 +501 @@
 begin
   Backend.LoadFromCanvas(Canvas);
+end;
+
+procedure TFPixmap.LoadFromBitmap(Bitmap: TBitmap);
+begin
+  Backend.LoadFromBitmap(Bitmap);
 end;
 

trunk/Packages/FastGraphics/UGGraphics.pas

@@ -68 +68 @@
     procedure PaintToBitmap(Bitmap: TBitmap; Rect: TRect; ColorConvertFunc: TGConvertColor);
     procedure LoadFromCanvas(Canvas: TCanvas; ColorConvertFunc: TGConvertFromColor); overload;
+    procedure LoadFromBitmap(Bitmap: TBitmap; ColorConvertFunc: TGConvertFromColor);
     procedure Fill(Color: TGColor); overload;
     procedure Fill(Func: TGGetColor); overload;
@@ -224 +225 @@
 end;
 
-procedure TGPixmap<TGColor>.LoadFromCanvas(Canvas: TCanvas; ColorConvertFunc: TGConvertFromColor); overload;
+procedure TGPixmap<TGColor>.LoadFromCanvas(Canvas: TCanvas; ColorConvertFunc: TGConvertFromColor);
 var
   X, Y: Integer;
@@ -236 +237 @@
   finally
     Canvas.Unlock;
+  end;
+end;
+
+procedure TGPixmap<TGColor>.LoadFromBitmap(Bitmap: TBitmap; ColorConvertFunc: TGConvertFromColor);
+var
+  X, Y: Integer;
+  PixelPtr: PInteger;
+  PixelPtrMax: PInteger;
+  PixelRowPtr: PInteger;
+  P: TPixelFormat;
+  RawImage: TRawImage;
+  BytePerPixel: Integer;
+begin
+  try
+    Bitmap.BeginUpdate(False);
+    RawImage := Bitmap.RawImage;
+    PixelRowPtr := PInteger(RawImage.Data);
+    BytePerPixel := RawImage.Description.BitsPerPixel div 8;
+    PixelPtrMax := PixelRowPtr + RawImage.Description.Width * RawImage.Description.Height * BytePerPixel;
+    for Y := 0 to FSize.Y - 1 do begin
+      PixelPtr := PixelRowPtr;
+      for X := 0 to FSize.X - 1 do begin
+        if (X >= 0) and (X < FSize.X) and (Y >= 0) and (Y < FSize.Y) and (PixelPtr < PixelPtrMax) then
+          Pixels[X, Y] := ColorConvertFunc(PixelPtr^);
+        Inc(PByte(PixelPtr), BytePerPixel);
+      end;
+      Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
+    end;
+  finally
+    Bitmap.EndUpdate(False);
   end;
 end;