Commit 43071cb7f2439525f3e55dadcc3a644d86fd0535
2002-01-25T22:55:53
* src/cff/cffdrivr.c (cff_get_name_index): Make last patch work actually.
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
diff --git a/ChangeLog b/ChangeLog
index 189ac7b..d8a4917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-25 Werner Lemberg <wl@gnu.org>
+
+ * src/cff/cffdrivr.c (cff_get_name_index): Make last patch work
+ actually.
+
2002-01-25 Martin Zinser <zinser@decus.de>
* src/cache/ftccache.c (ftc_node_done, ftc_node_destroy): Fix
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 6f84379..6b89b2a 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -228,7 +228,7 @@
FT_UInt buffer_max )
{
CFF_Font* font = (CFF_Font*)face->extra.data;
- FT_Memory memory = FT_FACE_MEMORY(face);
+ FT_Memory memory = FT_FACE_MEMORY( face );
FT_String* gname;
FT_UShort sid;
PSNames_Interface* psnames;
@@ -341,6 +341,7 @@
CFF_Font* cff;
CFF_Charset* charset;
PSNames_Interface* psnames;
+ FT_Memory memory = FT_FACE_MEMORY( face );
FT_String* name;
FT_UShort sid;
FT_UInt i;
@@ -367,7 +368,7 @@
if ( sid > 390 )
FREE( name );
- if ( !ret )
+ if ( !result )
return i;
}