Commit 7ae9b9996bfd2e4a2f63e7d987f577c30023781b
2016-05-07T16:24:03
[cache] Allow value 0 for face ID. We never dereference `face_id', and some implementations might use a running number instead of a pointer. Additionally, disallowing value zero was undocumented. * src/cache/ftccmap.c (FTC_CMapCache_Lookup), src/cache/ftcmanag.c (FTC_Manager_LookupFace, FTC_Manager_RemoveFaceID): Remove test for `face_id'.
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
diff --git a/ChangeLog b/ChangeLog
index a197e49..0cc48b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-05-07 Werner Lemberg <wl@gnu.org>
+
+ [cache] Allow value 0 for face ID.
+
+ We never dereference `face_id', and some implementations might use a
+ running number instead of a pointer. Additionally, disallowing
+ value zero was undocumented.
+
+ * src/cache/ftccmap.c (FTC_CMapCache_Lookup), src/cache/ftcmanag.c
+ (FTC_Manager_LookupFace, FTC_Manager_RemoveFaceID): Remove test for
+ `face_id'.
+
2016-05-05 Alexei Podtelezhnikov <apodtele@gmail.com>
[smooth] More efficient accounting of conic splits and draws.
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index 52fb3c7..41a0ce9 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -259,9 +259,6 @@
return 0;
}
- if ( !face_id )
- return 0;
-
query.face_id = face_id;
query.cmap_index = (FT_UInt)cmap_index;
query.char_code = char_code;
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 1f44d80..661a32a 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -314,7 +314,7 @@
FTC_MruNode mrunode;
- if ( !aface || !face_id )
+ if ( !aface )
return FT_THROW( Invalid_Argument );
*aface = NULL;
@@ -672,7 +672,7 @@
FT_UInt nn;
- if ( !manager || !face_id )
+ if ( !manager )
return;
/* this will remove all FTC_SizeNode that correspond to