GIF fix for D2009, small updates, 0.26.3

galfar · Feb 15, 2009 · 38213d8 · 38213d8
1 parent 02d0aa2
commit 38213d8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 8 deletions.
diff --git a/Extras/Contrib/ExtraGIF/ImagingGif.pas b/Extras/Contrib/ExtraGIF/ImagingGif.pas
@@ -1470,6 +1470,13 @@ initialization
   -- TODOS ----------------------------------------------------
     - nothing now
 
+   -- 0.26.3 Changes/Bug Fixes ---------------------------------
+    - Fixed bug - loading of GIF with NETSCAPE app extensions
+      failed with Delphi 2009.
+   
+  -- 0.26.1 Changes/Bug Fixes ---------------------------------
+    - ExtraGIF fork.
+
   -- 0.25.0 Changes/Bug Fixes ---------------------------------
     - Fixed loading of some rare GIFs, problems with LZW
       decompression.

diff --git a/Extras/Extensions/OpenJpeg.pas b/Extras/Extensions/OpenJpeg.pas
@@ -47,6 +47,9 @@
   Current Version: 1.01 (OpenJpeg 1.3.0 SVN revision 507 with my CDEF patch)
 
   History:
+    v1.02 (2009-01-??):
+      - removed linking to stdc++ lib in LINUX/UNIX
+      - using CRTL unit in Delphi, removed linking to some functions from msvcrtl.dll
     v1.01 (2008-12-27):
       - removed linking to stdc++ lib in LINUX/UNIX
       - Delphi 2009 compatibility checks
@@ -513,6 +516,11 @@ function opj_encode(cinfo: popj_cinfo_t; cio: popj_cio_t; image: popj_image_t;
 
 implementation
 
+{$IF Defined(DCC)}
+uses
+  crtl;
+{$IFEND}
+
 {$IF Defined(WIN32)}
 
   {$IF Defined(DCC)}

diff --git a/Scripts/Clean.bat b/Scripts/Clean.bat
@@ -3,7 +3,7 @@ echo Deleting ugly files...
 
 set ROOTDIR=..
 set EXTS=*.dcu *.ppu *.a *.dpu *.o *.rst *.bak *.bk? *.~* *.*~ *.or *.obj
-set EXTS=%EXTS% *.tgs *.tgw *.identcache *.local
+set EXTS=%EXTS% *.tgs *.tgw *.identcache *.local *.stat
 
 del /q /f %ROOTDIR%\Demos\Bin\_BenchOut.* 2>nul 1>nul
 
@@ -17,6 +17,7 @@ call :DELINTREE %ROOTDIR%\Source\Extensions
 call :DELINTREE %ROOTDIR%\Source\Projects
 call :DELINDIR %ROOTDIR%\Source
 call :DELINDIR %ROOTDIR%\Extras\Extensions
+call :DELINDIR %ROOTDIR%\Extras\Extensions\LibTiff
 call :DELINTREE %ROOTDIR%\Extras\Demos
 call :DELINTREE %ROOTDIR%\Extras\Tools
 

diff --git a/Source/ImagingFormats.pas b/Source/ImagingFormats.pas
@@ -388,6 +388,7 @@ procedure SetPixelFPFloat32(Bits: Pointer; Info: PImageFormatInfo; Palette: PPal
     BytesPerPixel: 1;
     ChannelCount: 1;
     PaletteEntries: 256;
+    HasAlphaChannel: True;
     IsIndexed: True;
     GetPixelsSize: GetStdPixelsSize;
     CheckDimensions: CheckStdDimensions;
@@ -4224,6 +4225,9 @@ initialization
     - nothing now
     - rewrite StretchRect for 8bit channels to use integer math?
 
+  -- 0.26.3 Changes/Bug Fixes -----------------------------------
+    - ifIndex8 format now has HasAlphaChannel=True.
+
   -- 0.25.0 Changes/Bug Fixes -----------------------------------
     - Made some resampling stuff public so that it can be used in canvas class.
     - Added some color constructors.

diff --git a/Source/ImagingGif.pas b/Source/ImagingGif.pas
@@ -155,17 +155,17 @@ implementation
   GIFAppBufferExtension = 2;
 
 type
-  TGIFIdentifierCode = array[0..7] of char;
-  TGIFAuthenticationCode = array[0..2] of char;
+  TGIFIdentifierCode = array[0..7] of AnsiChar;
+  TGIFAuthenticationCode = array[0..2] of AnsiChar;
   TGIFApplicationRec = packed record
-    Identifier		  : TGIFIdentifierCode;
-    Authentication	: TGIFAuthenticationCode;
+    Identifier: TGIFIdentifierCode;
+    Authentication: TGIFAuthenticationCode;
   end;
 
 const
   CodeTableSize = 4096;
   HashTableSize = 17777;
-  
+
 type
   TReadContext = record
     Inx: Integer;
@@ -1208,6 +1208,10 @@ initialization
  -- TODOS ----------------------------------------------------
     - nothing now
 
+  -- 0.26.3 Changes/Bug Fixes ---------------------------------
+    - Fixed bug - loading of GIF with NETSCAPE app extensions
+      failed with Delphi 2009.
+
   -- 0.26.1 Changes/Bug Fixes ---------------------------------
     - GIF loading and animation mostly rewritten, based on
       modification by Sergey Galezdinov (ExtraGIF in Extras/Contrib).

diff --git a/Source/ImagingOptions.inc b/Source/ImagingOptions.inc
@@ -17,7 +17,9 @@
 
 { File format support linking options.
   Define formats which you don't want to be registred automatically.
-  Default: all formats are registered, no symbols defined.}
+  Default: all formats are registered = no symbols defined.
+  Example: If you want to disable JPEG support just uncomment //{$DEFINE DONT_LINK_JPEG line
+}
 
 //{$DEFINE DONT_LINK_JPEG}        // link support for Jpeg images
 //{$DEFINE DONT_LINK_PNG}         // link support for PNG images

diff --git a/Source/ImagingTypes.pas b/Source/ImagingTypes.pas
@@ -39,7 +39,7 @@ interface
   { Current Minor version of Imaging.}
   ImagingVersionMinor = 26;
   { Current patch of Imaging.}
-  ImagingVersionPatch = 2;
+  ImagingVersionPatch = 3;
 
   { Imaging Option Ids whose values can be set/get by SetOption/
     GetOption functions.}