shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* src/cache/ftccache.i (GEN_CACHE_LOOKUP): Move declaration of
`family' and `hash' up to make it compilable with g++.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -7,6 +7,8 @@

 	* src/cache/ftccache.c (ftc_node_hash_unlink, ftc_node_hash_link)

 	[FTC_CACHE_USE_LINEAR_HASHING]: Fix returned error code.

 	Fix debugging messages.

+	* src/cache/ftccache.i (GEN_CACHE_LOOKUP): Move declaration of

+	`family' and `hash' up to make it compilable with g++.

 	* src/type42/t42error.h: New file.

 	* src/type42/t42drivr.c, src/type42/t42objs.c,

--- a/src/cache/ftccache.i

+++ b/src/cache/ftccache.i

@@ -31,6 +31,8 @@

                     FTC_Node   *anode )

   {

     FT_LruNode  lru;

+    FTC_Family  family;

+    FT_UFast    hash;

     query->hash   = 0;

@@ -70,10 +72,11 @@

     }

     {

-      FTC_Family  family = (FTC_Family) lru;

-      FT_UFast    hash   = query->hash;

-      FTC_Node    node, *pnode, *bucket;

+      FTC_Node  node, *pnode, *bucket;

+

+      family = (FTC_Family)lru;

+      hash   = query->hash;

 #ifdef FTC_CACHE_USE_LINEAR_HASHING

       FT_UInt  index;