Re: [Devel] ftgzip reentrant?

[Detlef Würkner]

address@hidden (David Turner) wrote:

> Detlef Würkner wrote:
> > Hello!
> > 
> > When defining FT_CONFIG_OPTION_USE_ZLIB and not defining
> > FT_CONFIG_OPTION_SYSTEM_ZLIB, i.e. when using the gzip code from ftgzip.c,
> > the symbol BUILDFIXED gets defined in ftgzip.c.
> > 
> > With BUILDFIXED defined, in inftrees.c the following happens
> > 
> Oops, this should be fixed, and BUILDFIXED undefined when we use
> our copy of the ZLib sources (heavily modified to make them build
> cleanly on most compilers in a single object file)
> 
> Thanks for pointing this,

Still not in CVS. Werner? Here's a patch for the CVS of today:

--- src/gzip/ftgzip.c.ori       Fri May 23 08:41:42 2003
+++ src/gzip/ftgzip.c   Fri Jun  6 08:48:50 2003
@@ -42,7 +42,7 @@
  /* original ZLib.                                                   */
 
 #define NO_DUMMY_DECL
-#define BUILDFIXED    /* save code size */
+/* #define  BUILDFIXED */   /* save code size */
 #define MY_ZCALLOC
 
 #include "zlib.h"



This fixes a warning about an unused parameter when BUILDFIXED is not
defined:

--- src/gzip/inftrees.c.ori     Wed Feb  5 09:33:12 2003
+++ src/gzip/inftrees.c Fri Jun  6 08:38:31 2003
@@ -451,6 +451,8 @@
     ZFREE(z, c);
     fixed_built = 1;
   }
+#else
+  FT_UNUSED(z);
 #endif
   *bl = fixed_bl;
   *bd = fixed_bd;



And this fixes a warning of gcc 2.95.3 for m68k (the "might be clobbered
by longjmp" warning IIRC):

--- src/sfnt/ttcmap0.c.ori      Fri May  9 14:58:07 2003
+++ src/sfnt/ttcmap0.c  Fri May 23 09:19:59 2003
@@ -1835,7 +1835,7 @@
       if ( offset && table + offset + 2 < limit )
       {
         FT_Byte*                       cmap   = table + offset;
-        FT_UInt                        format = TT_PEEK_USHORT( cmap );
+        volatile FT_UInt               format = TT_PEEK_USHORT( cmap );
         const TT_CMap_Class* volatile  pclazz = tt_cmap_classes;
         TT_CMap_Class                  clazz;



The last thing are two warnings that appear here:

FT:src/truetype/ttgload.h:36: warning: declaration of `index' shadows global 
declaration
FT:include/freetype/internal/psaux.h:74: warning: declaration of `index' 
shadows global declaration

Ciao, Detlef
-- 
_ // address@hidden
\X/  Detlef Wuerkner, Langgoens/Germany