shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[sfnt] Remove redundant code.

* src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for
`num_instances', which will always succeed.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2017-03-05  Werner Lemberg  <[email protected]>

+

+	[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  <[email protected]>

 	[sfnt] Add `get_name_id' service.

--- 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 )