From 8880f2c14d1c410dc7ca87fd5d05b58d78c3dcc1 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 25 Jan 2002 16:05:39 +0000 Subject: [PATCH] * 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. --- ChangeLog | 17 ++++++++++++++--- builds/vms/descrip.mms | 2 +- src/autohint/descrip.mms | 2 +- src/base/descrip.mms | 4 ++-- src/cache/descrip.mms | 5 ++++- src/cache/ftccache.c | 4 ++-- src/cff/cffdrivr.c | 8 +++++++- src/cff/descrip.mms | 2 +- src/cid/descrip.mms | 2 +- src/pcf/descrip.mms | 2 +- src/psaux/descrip.mms | 2 +- src/pshinter/descrip.mms | 2 +- src/psnames/descrip.mms | 2 +- src/raster/descrip.mms | 2 +- src/sfnt/descrip.mms | 2 +- src/sfnt/sfdriver.c | 4 ++-- src/smooth/descrip.mms | 2 +- src/truetype/descrip.mms | 2 +- src/type1/descrip.mms | 2 +- src/winfonts/descrip.mms | 2 +- 20 files changed, 45 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index cccdd0995..189ac7b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,18 @@ -2002-01-21 Antoine Leca +2002-01-25 Martin Zinser - * 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 + + * src/cff/cffdrivr.c (cff_get_name_index): Fix deallocation bug. + +2002-01-21 Antoine Leca + + * docs/PATENTS: Typo fixed (thanks to Detlef "Hawkeye" Würkner) in + the URL for the online resource. 2002-01-18 Ian Brown diff --git a/builds/vms/descrip.mms b/builds/vms/descrip.mms index 730c1ce54..54392d109 100644 --- a/builds/vms/descrip.mms +++ b/builds/vms/descrip.mms @@ -18,7 +18,7 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([],[--.include],[--.src.base]) OBJS=ftsystem.obj all : $(OBJS) - library/create [--.lib]freetype.olb $(OBJS) + library/create [--.lib]freetype.olb $(OBJS) ftsystem.obj : ftsystem.c ftconfig.h diff --git a/src/autohint/descrip.mms b/src/autohint/descrip.mms index cce93a48f..e84b41112 100644 --- a/src/autohint/descrip.mms +++ b/src/autohint/descrip.mms @@ -20,6 +20,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint]) OBJS=autohint.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/base/descrip.mms b/src/base/descrip.mms index 1f9f91da4..efa5b07f3 100644 --- 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 diff --git a/src/cache/descrip.mms b/src/cache/descrip.mms index b87c1c6f9..b3db22c4e 100644 --- a/src/cache/descrip.mms +++ b/src/cache/descrip.mms @@ -18,6 +18,9 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache]) 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 diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index f32f7d421..54d06ab4f 100644 --- 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 )); } diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 03ad0c42c..6f8437920 100644 --- 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; } diff --git a/src/cff/descrip.mms b/src/cff/descrip.mms index b4a99d196..e3816fe15 100644 --- a/src/cff/descrip.mms +++ b/src/cff/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff]) OBJS=cff.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/cid/descrip.mms b/src/cid/descrip.mms index 1502e422a..592fd587a 100644 --- a/src/cid/descrip.mms +++ b/src/cid/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid]) OBJS=type1cid.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/pcf/descrip.mms b/src/pcf/descrip.mms index c9dd63864..6f9ae7c3c 100644 --- a/src/pcf/descrip.mms +++ b/src/pcf/descrip.mms @@ -30,6 +30,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf]) OBJS=pcf.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/psaux/descrip.mms b/src/psaux/descrip.mms index d3ed754b0..6ecd8addc 100644 --- a/src/psaux/descrip.mms +++ b/src/psaux/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux]) OBJS=psaux.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/pshinter/descrip.mms b/src/pshinter/descrip.mms index a2a6eaa75..3bdb8a085 100644 --- a/src/pshinter/descrip.mms +++ b/src/pshinter/descrip.mms @@ -20,4 +20,4 @@ OBJS=pshinter.obj all : $(OBJS) library [--.lib]freetype.olb $(OBJS) -# EOF \ No newline at end of file +# EOF diff --git a/src/psnames/descrip.mms b/src/psnames/descrip.mms index bb86c547e..ba8b26f76 100644 --- a/src/psnames/descrip.mms +++ b/src/psnames/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames]) OBJS=psnames.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/raster/descrip.mms b/src/raster/descrip.mms index ea42a4bbd..d0650ebbf 100644 --- a/src/raster/descrip.mms +++ b/src/raster/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster]) OBJS=raster.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/sfnt/descrip.mms b/src/sfnt/descrip.mms index 8eeb2a6aa..fb5c724b1 100644 --- a/src/sfnt/descrip.mms +++ b/src/sfnt/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt]) OBJS=sfnt.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index d1f0ba4af..48fa643a1 100644 --- 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; diff --git a/src/smooth/descrip.mms b/src/smooth/descrip.mms index 67d62ecd5..9ebc7ff22 100644 --- a/src/smooth/descrip.mms +++ b/src/smooth/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth]) OBJS=smooth.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/truetype/descrip.mms b/src/truetype/descrip.mms index 92ea89a71..675fd0e02 100644 --- a/src/truetype/descrip.mms +++ b/src/truetype/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype]) OBJS=truetype.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/type1/descrip.mms b/src/type1/descrip.mms index da50ab158..03ebb1115 100644 --- a/src/type1/descrip.mms +++ b/src/type1/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1]) OBJS=type1.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF diff --git a/src/winfonts/descrip.mms b/src/winfonts/descrip.mms index 1f431e410..773ae5906 100644 --- a/src/winfonts/descrip.mms +++ b/src/winfonts/descrip.mms @@ -18,6 +18,6 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.winfonts]) OBJS=winfnt.obj all : $(OBJS) - library [--.lib]freetype.olb $(OBJS) + library [--.lib]freetype.olb $(OBJS) # EOF