[JVCL-Checkins] dev/JVCL3/run JvAni.pas,1.20,1.21 JvGIF.pas,1.11,1.12 JvResources.pas,1.40,1.41 - JvAniFile.pas integrated into JvAni.pas

[Robert M. <mar...@pr...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17605/JVCL3/run

Modified Files:
	JvAni.pas JvGIF.pas JvResources.pas 
Log Message:
JvAniFile.pas integrated into JvAni.pas


Index: JvGIF.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGIF.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvGIF.pas	26 Jan 2004 15:21:30 -0000	1.11
--- JvGIF.pas	27 Jan 2004 09:30:19 -0000	1.12
***************
*** 251,255 ****
  uses
    Consts, Math,
!   JvJCLUtils, JvJVCLUtils, JvAniFile, JvConsts, JvResources, JvTypes;
  
  {$R-}
--- 251,255 ----
  uses
    Consts, Math,
!   JvJCLUtils, JvJVCLUtils, JvAni, JvConsts, JvResources, JvTypes;
  
  {$R-}
***************
*** 1963,1977 ****
    end
    else
!   if Source is TJvAnimatedCursorImage then
    begin
      NewImage;
      FBackgroundColor := clWindow;
!     with TJvAnimatedCursorImage(Source) do
      begin
!       for I := 0 to IconCount - 1 do
        begin
          AddFrame(TIcon(Icons[I]));
!         Self.Frames[FrameIndex].FAnimateInterval :=
!           Longint(Rates[I] * 100) div 6;
        end;
      end;
--- 1963,1979 ----
    end
    else
!   if Source is TJvAni then
    begin
      NewImage;
      FBackgroundColor := clWindow;
!     with TJvAni(Source) do
      begin
!       for I := 0 to FrameCount - 1 do
        begin
          AddFrame(TIcon(Icons[I]));
!         Self.Frames[I].FAnimateInterval :=
!           Longint(Frames[I].Rate * 100) div 6;
!         if Frames[I].Rate = 0 then
!           Self.Frames[I].FAnimateInterval := 100;
        end;
      end;

Index: JvResources.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvResources.pas,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** JvResources.pas	21 Jan 2004 14:25:46 -0000	1.40
--- JvResources.pas	27 Jan 2004 09:30:19 -0000	1.41
***************
*** 109,119 ****
    RsAniExtension = 'ani';
    RsAniFilterName = 'ANI Image';
  
    RsEInvalidAnimatedIconImage = 'Invalid animated icon image';
  
- //=== JvAniFile.pas ==========================================================
- resourcestring
-   RsAniCurFilter = 'Animated Cursors (*.ani)|*.ani|Any files (*.*)|*.*';
- 
  //=== JvAppIniStorage.pas ======================================================
  resourcestring
--- 109,116 ----
    RsAniExtension = 'ani';
    RsAniFilterName = 'ANI Image';
+   RsAniCurFilter = 'Animated Cursors (*.ani)|*.ani|Any files (*.*)|*.*';
  
    RsEInvalidAnimatedIconImage = 'Invalid animated icon image';
  
  //=== JvAppIniStorage.pas ======================================================
  resourcestring

Index: JvAni.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAni.pas,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JvAni.pas	26 Jan 2004 15:21:30 -0000	1.20
--- JvAni.pas	27 Jan 2004 09:30:18 -0000	1.21
***************
*** 15,18 ****
--- 15,25 ----
  All Rights Reserved.
  
+ The Original Code is: JvAniFile.PAS, released on 2002-07-04.
+ 
+ The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
+ Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
+ Copyright (c) 2001,2002 SGB Software
+ All Rights Reserved.
+ 
[...1196 lines suppressed...]
+       end;
+       if DecreaseColors then
+         DecreaseBMPColors(Temp, Max(OriginalColors, 16));
+     end;
+     Bitmap.Assign(Temp);
+   finally
+     Temp.Free;
+   end;
+ end;
+ 
+ {$ENDIF VCL}
+ 
  initialization
    Classes.RegisterClass(TJvAni);
***************
*** 334,335 ****
--- 1083,1085 ----
  
  end.
+