Changeset 472 for GraphicTest/Packages/bgrabitmap/bgraanimatedgif.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/bgraanimatedgif.pas (modified) (14 diffs)

GraphicTest/Packages/bgrabitmap/bgraanimatedgif.pas

@@ -34 +34 @@
     FTimeAccumulator: double;
     FCurrentImage, FWantedImage: integer;
+    FFullAnimationTime: double;
     FPreviousDisposeMode: TDisposeMode;
 
@@ -41 +42 @@
 
     function GetCount: integer;
+    function GetTimeUntilNextImage: integer;
     procedure Render(StretchWidth, StretchHeight: integer);
     procedure UpdateSimple(Canvas: TCanvas; ARect: TRect;
@@ -70 +72 @@
     BackgroundMode: TGifBackgroundMode;
 
-    constructor Create(filename: string);
+    constructor Create(filenameUTF8: string);
     constructor Create(stream: TStream);
     constructor Create; override;
@@ -78 +80 @@
     procedure LoadFromStream(Stream: TStream); override;
     procedure SaveToStream(Stream: TStream); override;
+    procedure LoadFromFile(const AFilenameUTF8: string); override;
+    procedure SaveToFile(const AFilenameUTF8: string); override;
     class function GetFileExtensions: string; override;
 
@@ -97 +101 @@
     property MemBitmap: TBGRABitmap Read GetMemBitmap;
     property CurrentImage: integer Read FCurrentImage Write SetCurrentImage;
+    property TimeUntilNextImageMs: integer read GetTimeUntilNextImage;
   end;
 
@@ -114 +119 @@
 implementation
 
-uses BGRABlend;
+uses BGRABlend, lazutf8classes;
 
 const
+  {$IFDEF ENDIAN_LITTLE}
   AlphaMask = $FF000000;
+  {$ELSE}
+  AlphaMask = $000000FF;
+  {$ENDIF}
 
 type
@@ -188 +197 @@
     if not FPaused then
       FTimeAccumulator += (curDate - FPrevDate) * 24 * 60 * 60 * 1000;
+    if FFullAnimationTime > 0 then FTimeAccumulator:= frac(FTimeAccumulator/FFullAnimationTime)*FFullAnimationTime;
     nextImage := FCurrentImage;
     while FTimeAccumulator > FImages[nextImage].Delay do
@@ -279 +289 @@
 end;
 
-constructor TBGRAAnimatedGif.Create(filename: string);
+function TBGRAAnimatedGif.GetTimeUntilNextImage: integer;
 var
-  Stream: TFileStream;
+  acc: double;
+begin
+  if Count <= 1 then result := 60*1000 else
+  if (FWantedImage <> -1) or (FCurrentImage = -1) then
+    result := 0
+  else
+  begin
+    acc := FTimeAccumulator;
+    if not FPaused then acc += (Now- FPrevDate) * 24 * 60 * 60 * 1000;
+    if acc >= FImages[FCurrentImage].Delay then
+      result := 0
+    else
+      result := round(FImages[FCurrentImage].Delay-FTimeAccumulator);
+  end;
+end;
+
+constructor TBGRAAnimatedGif.Create(filenameUTF8: string);
+var
+  Stream: TFileStreamUTF8;
 begin
   inherited Create;
   Init;
-  Stream := TFileStream.Create(filename, fmOpenRead);
+  Stream := TFileStreamUTF8.Create(filenameUTF8, fmOpenRead or fmShareDenyWrite);
   LoadFromStream(Stream);
   Stream.Free;
@@ -355 +383 @@
 end;
 
+procedure TBGRAAnimatedGif.LoadFromFile(const AFilenameUTF8: string);
+var stream: TFileStreamUTF8;
+begin
+  stream := TFileStreamUTF8.Create(AFilenameUTF8,fmOpenRead or fmShareDenyWrite);
+  try
+    LoadFromStream(Stream);
+  finally
+    Stream.Free;
+  end;
+end;
+
+procedure TBGRAAnimatedGif.SaveToFile(const AFilenameUTF8: string);
+var
+  Stream: TFileStreamUTF8;
+begin
+  Stream := TFileStreamUTF8.Create(AFilenameUTF8, fmCreate);
+  try
+    SaveToStream(Stream);
+  finally
+    Stream.Free;
+  end;
+end;
+
 {$HINTS OFF}
 procedure TBGRAAnimatedGif.LoadImages(stream: TStream);
@@ -458 +509 @@
     stridx:   longint;
     bitbuf, bitsinbuf: longint;
-    bytbuf:   array[0..255] of byte;
+    bytbuf:   packed array[0..255] of byte;
     bytinbuf, bytbufidx: byte;
     endofsrc: boolean;
@@ -684 +735 @@
   begin
     stream.Read(GIFImageDescriptor, sizeof(GIFImageDescriptor));
+    GIFImageDescriptor.Width := LEtoN(GIFImageDescriptor.Width);
+    GIFImageDescriptor.Height := LEtoN(GIFImageDescriptor.Height);
+    GIFImageDescriptor.x := LEtoN(GIFImageDescriptor.x);
+    GIFImageDescriptor.y := LEtoN(GIFImageDescriptor.y);
     if (GIFImageDescriptor.flags and GIFImageDescriptor_LocalColorTableFlag =
       GIFImageDescriptor_LocalColorTableFlag) then
@@ -724 +779 @@
     Clear;
     SetLength(FImages, NbImages);
+    FFullAnimationTime:= 0;
     for i := 0 to Count - 1 do
+    begin
       FImages[i] := NewImages[i];
+      FFullAnimationTime += NewImages[i].Delay;
+    end;
   end;
 
@@ -746 +805 @@
           mincount := sizeof(GIFGraphicControlExtension);
           stream.Read(GIFGraphicControlExtension, mincount);
+          GIFGraphicControlExtension.delaytime := LEtoN(GIFGraphicControlExtension.delaytime);
 
           if GIFGraphicControlExtension.flags and
@@ -781 +841 @@
   begin
     stream.Read(GIFScreenDescriptor, sizeof(GIFScreenDescriptor));
+    GIFScreenDescriptor.Width := LEtoN(GIFScreenDescriptor.Width);
+    GIFScreenDescriptor.Height := LEtoN(GIFScreenDescriptor.Height);
     FWidth  := GIFScreenDescriptor.Width;
     FHeight := GIFScreenDescriptor.Height;