freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master c1b000d 5/8: [sfnt] Remove redundant code.


From: Werner LEMBERG
Subject: [freetype2] master c1b000d 5/8: [sfnt] Remove redundant code.
Date: Mon, 6 Mar 2017 14:47:02 -0500 (EST)

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

    [sfnt] Remove redundant code.
    
    * src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for
    `num_instances', which will always succeed.
---
 ChangeLog         | 7 +++++++
 src/sfnt/sfobjs.c | 9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4915436..3bbfe42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-05  Werner Lemberg  <address@hidden>
+
+       [sfnt] Remove redundant code.
+
+       * src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for
+       `num_instances', which will always succeed.
+
 2017-03-04  Werner Lemberg  <address@hidden>
 
        [sfnt] Add `get_name_id' service.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index eb41704..4cc3e3f 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -999,15 +999,6 @@
       if ( !face->goto_table( face, TTAG_CFF, stream, 0 ) )
         num_instances = 0;
 
-      /* we support at most 2^15 - 1 instances */
-      if ( num_instances >= ( 1U << 15 ) - 1 )
-      {
-        if ( face_instance_index >= 0 )
-          return FT_THROW( Invalid_Argument );
-        else
-          num_instances = 0;
-      }
-
       /* instance indices in `face_instance_index' start with index 1, */
       /* thus `>' and not `>='                                         */
       if ( instance_index > num_instances )



reply via email to

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