freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 7ae9b99: [cache] Allow value 0 for face ID.


From: Werner LEMBERG
Subject: [freetype2] master 7ae9b99: [cache] Allow value 0 for face ID.
Date: Sat, 7 May 2016 14:24:20 +0000 (UTC)

branch: master
commit 7ae9b9996bfd2e4a2f63e7d987f577c30023781b
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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'.
---
 ChangeLog            |   12 ++++++++++++
 src/cache/ftccmap.c  |    3 ---
 src/cache/ftcmanag.c |    4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a197e49..0cc48b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-05-07  Werner Lemberg  <address@hidden>
+
+       [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  <address@hidden>
 
        [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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]