Changeset 472 for GraphicTest/Packages/bgrabitmap/bgrapaintnet.pas

Timestamp:

Apr 9, 2015, 9:58:36 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Use csOpaque control style also to Image, PaintBox and OpenGLControl.
• Modified: Change size of test frame with SpinEdits as delayed using timer.
• Updated: BRGABitmap package to version 8.1.

File:

• GraphicTest/Packages/bgrabitmap/bgrapaintnet.pas (modified) (18 diffs)

GraphicTest/Packages/bgrabitmap/bgrapaintnet.pas

@@ -27 +27 @@
   TPaintDotNetFile = class(TBGRACustomLayeredBitmap)
   public
-    procedure LoadFromFile(const filename: string); override;
+    procedure LoadFromFile(const filenameUTF8: string); override;
     procedure LoadFromStream(stream: TStream); override;
     procedure Clear; override;
@@ -34 +34 @@
     constructor Create; override;
   protected
+    procedure InternalLoadFromStream(stream: TStream);
     function GetWidth: integer; override;
     function GetHeight: integer; override;
@@ -42 +43 @@
     function GetLayerName(layer: integer): string; override;
   private
-    XmlHeader: string;
-    ThumbNail: TBGRABitmap;
     Content:   TDotNetDeserialization;
     Document:  TSerializedClass;
@@ -60 +59 @@
 
   TFPReaderPaintDotNet = class(TFPCustomImageReader)
+    private
+      FWidth,FHeight,FNbLayers: integer;
     protected
       function InternalCheck(Stream: TStream): boolean; override;
       procedure InternalRead(Stream: TStream; Img: TFPCustomImage); override;
+    public
+      property Width: integer read FWidth;
+      property Height: integer read FHeight;
+      property NbLayers: integer read FNbLayers;
   end;
 
 function IsPaintDotNetFile(filename: string): boolean;
+function IsPaintDotNetFileUTF8(filenameUTF8: string): boolean;
 function IsPaintDotNetStream(stream: TStream): boolean;
 function LoadPaintDotNetFile(filename: string): TBGRABitmap;
+function LoadPaintDotNetFileUTF8(filenameUTF8: string): TBGRABitmap;
 
 procedure RegisterPaintNetFormat;
@@ -73 +80 @@
 implementation
 
-uses zstream, Math, graphtype, Graphics;
+uses zstream, Math, graphtype, Graphics, lazutf8classes, FileUtil;
 
 {$hints off}
@@ -99 +106 @@
   begin
     stream := TFileStream.Create(filename, fmOpenRead);
+    Result := IsPaintDotNetStream(stream);
+    stream.Free;
+  end;
+end;
+
+function IsPaintDotNetFileUTF8(filenameUTF8: string): boolean;
+var
+  stream: TFileStreamUTF8;
+begin
+  Result := False;
+  if FileExistsUTF8(filenameUTF8) then
+  begin
+    stream := TFileStreamUTF8.Create(filenameUTF8, fmOpenRead);
     Result := IsPaintDotNetStream(stream);
     stream.Free;
@@ -127 +147 @@
 
 function LoadPaintDotNetFile(filename: string): TBGRABitmap;
+begin
+  result := LoadPaintDotNetFileUTF8(SysToUTF8(filename));
+end;
+
+function LoadPaintDotNetFileUTF8(filenameUTF8: string): TBGRABitmap;
 var
   pdn: TPaintDotNetFile;
@@ -133 +158 @@
   Result := nil;
   try
-    pdn.LoadFromFile(filename);
+    pdn.LoadFromFile(filenameUTF8);
     Result := pdn.ComputeFlatImage;
     pdn.Free;
@@ -181 +206 @@
   x,y: integer;
 begin
+  FWidth := 0;
+  FHeight:= 0;
+  FNbLayers:= 0;
   pdn    := TPaintDotNetFile.Create;
   try
@@ -186 +214 @@
     flat := pdn.ComputeFlatImage;
     try
-      Img.SetSize(pdn.Width,pdn.Height);
-      for y := 0 to pdn.Height-1 do
-        for x := 0 to pdn.Width-1 do
-          Img.Colors[x,y] := BGRAToFPColor(flat.GetPixel(x,y));
+      FWidth:= pdn.Width;
+      FHeight:= pdn.Height;
+      FNbLayers:= pdn.NbLayers;
+
+      if Img is TBGRACustomBitmap then
+        TBGRACustomBitmap(Img).Assign(flat) else
+      begin
+        Img.SetSize(pdn.Width,pdn.Height);
+        for y := 0 to pdn.Height-1 do
+          for x := 0 to pdn.Width-1 do
+            Img.Colors[x,y] := BGRAToFPColor(flat.GetPixel(x,y));
+      end;
     finally
       flat.free;
@@ -205 +241 @@
 { TPaintDotNetFile }
 
-procedure TPaintDotNetFile.LoadFromFile(const filename: string);
-var
-  stream: TFileStream;
-begin
-  stream := TFileStream.Create(filename, fmOpenRead);
+procedure TPaintDotNetFile.LoadFromFile(const filenameUTF8: string);
+var
+  stream: TFileStreamUTF8;
+begin
+  stream := TFileStreamUTF8.Create(filenameUTF8, fmOpenRead);
+  OnLayeredBitmapLoadStart(filenameUTF8);
   try
-    LoadFromStream(stream);
+    InternalLoadFromStream(stream);
   finally
+    OnLayeredBitmapLoaded;
     stream.Free;
   end;
@@ -218 +256 @@
 
 procedure TPaintDotNetFile.LoadFromStream(stream: TStream);
+begin
+  OnLayeredBitmapLoadFromStreamStart;
+  try
+    InternalLoadFromStream(stream);
+  finally
+    OnLayeredBitmapLoaded;
+  end;
+end;
+
+procedure TPaintDotNetFile.InternalLoadFromStream(stream: TStream);
 var
   header: packed array[0..3] of char;
@@ -233 +281 @@
   stream.Read(XmlHeaderSize, 3);
   XmlheaderSize := LEtoN(XmlheaderSize);
-  setlength(XmlHeader, XmlHeaderSize);
-  if stream.Read(XmlHeader[1], XmlHeaderSize) <> XmlHeaderSize then
+  if Stream.Position + XmlHeaderSize > stream.Size then
     raise Exception.Create('Xml header size error');
-  XmlHeader := Utf8ToAnsi(XmlHeader);
+  Stream.Position:= Stream.Position + XmlHeaderSize;
      {$hints off}
   stream.Read(CompressionFormat, sizeof(CompressionFormat));
@@ -255 +302 @@
   for i := 0 to NbLayers - 1 do
   begin
+    OnLayeredBitmapLoadProgress((i+1)*100 div NbLayers);
     LayerData[i] := TMemoryStream.Create;
     LoadLayer(LayerData[i], Stream, LayerDataSize(i));
@@ -266 +314 @@
 begin
   Result := 'Paint.Net document' + LineEnding + LineEnding;
-  if length(XmlHeader) > 255 then
-    Result += copy(XmlHeader, 1, 255) + '...'
-  else
-    Result += XmlHeader;
-  Result += LineEnding + LineEnding + Content.ToString;
+  Result += Content.ToString;
   for i := 0 to NbLayers - 1 do
   begin
@@ -297 +341 @@
   inherited Create;
   Content   := nil;
-  ThumbNail := nil;
   Document  := nil;
   Layers    := nil;
@@ -308 +351 @@
   i: integer;
 begin
-  XmlHeader := '';
   FreeAndNil(content);
-  FreeAndNil(thumbNail);
   document := nil;
   Layers   := nil;
@@ -610 +651 @@
   RegisterLayeredBitmapReader('pdn', TPaintDotNetFile);
   //TPicture.RegisterFileFormat('pdn', 'Paint.NET image', TPaintDotNetFile);
+  DefaultBGRAImageReader[ifPaintDotNet] := TFPReaderPaintDotNet;
   AlreadyRegistered := true;
 end;