Commit 8880f2c14d1c410dc7ca87fd5d05b58d78c3dcc1
2002-01-25T16:05:39
* 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288
diff --git a/ChangeLog b/ChangeLog
index cccdd09..189ac7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-2002-01-21 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
+2002-01-25 Martin Zinser <zinser@decus.de>
- * 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 <wangyi@founder.com.cn>
+
+ * src/cff/cffdrivr.c (cff_get_name_index): Fix deallocation bug.
+
+2002-01-21 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
+
+ * docs/PATENTS: Typo fixed (thanks to Detlef "Hawkeye" Würkner) in
+ the URL for the online resource.
2002-01-18 Ian Brown <ian.brown@printsoft.de>
diff --git a/builds/vms/descrip.mms b/builds/vms/descrip.mms
index 730c1ce..54392d1 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 cce93a4..e84b411 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 1f9f91d..efa5b07 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 b87c1c6..b3db22c 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 f32f7d4..54d06ab 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 03ad0c4..6f84379 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 b4a99d1..e3816fe 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 1502e42..592fd58 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 c9dd638..6f9ae7c 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 d3ed754..6ecd8ad 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 a2a6eaa..3bdb8a0 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 bb86c54..ba8b26f 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 ea42a4b..d0650eb 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 8eeb2a6..fb5c724 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 d1f0ba4..48fa643 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 67d62ec..9ebc7ff 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 92ea89a..675fd0e 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 da50ab1..03ebb11 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 1f431e4..773ae59 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