shithub: freetype+ttf2subf

Download patch

ref: 8880f2c14d1c410dc7ca87fd5d05b58d78c3dcc1
parent: 84712cc3fb4f30cda945d752d776ee4f8d512cf3
author: Werner Lemberg <[email protected]>
date: Fri Jan 25 11:05:39 EST 2002 

* src/cache/ftccache.c (ftc_node_done, ftc_node_destroy): Fix
compilation warnings.
* src/base/descrip.mms (OBJS): Add `ftmm.obj'.
* src/cache/descrip.mms (ftcache.obj): Dependencies added.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-2002-01-21  Antoine Leca <[email protected]>
+2002-01-25  Martin Zinser  <[email protected]>
 
-        * docs/PATENTS: Typo fixed (Thanks to Detlef "Hawkeye"
-        Wuerkner) in the URL for the on-line resource.
+	* src/cache/ftccache.c (ftc_node_done, ftc_node_destroy): Fix
+	compilation warnings.
+	* src/base/descrip.mms (OBJS): Add `ftmm.obj'.
+	* src/cache/descrip.mms (ftcache.obj): Dependencies added.
+
+2002-01-25  WANG Yi  <[email protected]>
+
+	* src/cff/cffdrivr.c (cff_get_name_index): Fix deallocation bug.
+
+2002-01-21  Antoine Leca  <[email protected]>
+
+	* docs/PATENTS: Typo fixed (thanks to Detlef "Hawkeye" W�rkner) in
+	the URL for the online resource.
 
 2002-01-18  Ian Brown  <[email protected]>
 
--- a/builds/vms/descrip.mms
+++ b/builds/vms/descrip.mms
@@ -18,7 +18,7 @@
 OBJS=ftsystem.obj
 
 all : $(OBJS)
-	library/create [--.lib]freetype.olb $(OBJS)
+        library/create [--.lib]freetype.olb $(OBJS)
 
 ftsystem.obj : ftsystem.c ftconfig.h
 
--- a/src/autohint/descrip.mms
+++ b/src/autohint/descrip.mms
@@ -20,6 +20,6 @@
 OBJS=autohint.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/base/descrip.mms
+++ b/src/base/descrip.mms
@@ -15,9 +15,9 @@
 
 CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
 
-OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj
+OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftmm.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/cache/descrip.mms
+++ b/src/cache/descrip.mms
@@ -18,6 +18,9 @@
 OBJS=ftcache.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
+
+ftcache.obj : ftcache.c ftlru.c ftcmanag.c ftccache.c ftcglyph.c ftcimage.c \
+              ftcsbits.c ftccmap.c 
 
 # EOF
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -44,7 +44,7 @@
     family = entry->family;
 
     /* remove from parent set table - eventually destroy the set */
-    if ( --family->num_nodes <= 0 )
+    if ( --family->num_nodes == 0 )
       FT_LruList_Remove( cache->families, (FT_LruNode) family );
   }
 
@@ -213,7 +213,7 @@
     FREE( node );
 
     /* check, just in case of general corruption :-) */
-    if ( manager->num_nodes <= 0 )
+    if ( manager->num_nodes == 0 )
       FT_ERROR(( "ftc_node_destroy: invalid cache node count! = %d\n",
                   manager->num_nodes ));
   }
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -344,6 +344,7 @@
     FT_String*          name;
     FT_UShort           sid;
     FT_UInt             i;
+    FT_Int              result;
 
 
     cff     = face->extra.data;
@@ -361,7 +362,12 @@
       else
         name = (FT_String *)psnames->adobe_std_strings( sid );
 
-      if ( !strcmp( glyph_name, name ) )
+      result = strcmp( glyph_name, name );
+
+      if ( sid > 390 )
+        FREE( name );
+
+      if ( !ret )
         return i;
     }
 
--- a/src/cff/descrip.mms
+++ b/src/cff/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=cff.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/cid/descrip.mms
+++ b/src/cid/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=type1cid.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/pcf/descrip.mms
+++ b/src/pcf/descrip.mms
@@ -30,6 +30,6 @@
 OBJS=pcf.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/psaux/descrip.mms
+++ b/src/psaux/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=psaux.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/pshinter/descrip.mms
+++ b/src/pshinter/descrip.mms
@@ -20,4 +20,4 @@
 all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
 
-# EOF
\ No newline at end of file
+# EOF
--- a/src/psnames/descrip.mms
+++ b/src/psnames/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=psnames.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/raster/descrip.mms
+++ b/src/raster/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=raster.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/sfnt/descrip.mms
+++ b/src/sfnt/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=sfnt.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -121,8 +121,8 @@
     if ( face->root.internal->postscript_name )
       return face->root.internal->postscript_name;
 
-    /* scan the name table to see if we have a Postscript name here, either */
-    /* in Macintosh or Windows platform encodings..                         */
+    /* scan the name table to see whether we have a Postscript name here, */
+    /* either in Macintosh or Windows platform encodings                  */
     for ( n = 0; n < face->num_names; n++ )
     {
       TT_NameRec*  name = face->name_table.names + n;
--- a/src/smooth/descrip.mms
+++ b/src/smooth/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=smooth.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/truetype/descrip.mms
+++ b/src/truetype/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=truetype.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/type1/descrip.mms
+++ b/src/type1/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=type1.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
--- a/src/winfonts/descrip.mms
+++ b/src/winfonts/descrip.mms
@@ -18,6 +18,6 @@
 OBJS=winfnt.obj
 
 all : $(OBJS)
-	library [--.lib]freetype.olb $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
 
 # EOF