shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[sfnt] Make error message filling NULL names less verbose.

* src/sfnt/ttpost.c (load_format_20): Showing 1 summary message
when we fill `post' names by NULL, instead of per-entry message.

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

--- a/ChangeLog

+++ b/ChangeLog

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

+2010-09-20  suzuki toshiya  <[email protected]>

+

+	[sfnt] Make error message filling NULL names less verbose.

+

+	* src/sfnt/ttpost.c (load_format_20): Showing 1 summary message

+	when we fill `post' names by NULL, instead of per-entry message.

+

 2010-09-20  Graham Asher  <[email protected]>

 	    David Bevan  <[email protected]>

--- a/src/sfnt/ttpost.c

+++ b/src/sfnt/ttpost.c

@@ -232,12 +232,7 @@

         if ( FT_STREAM_POS() >= post_limit )

-        {

-          FT_ERROR(( "load_format_20:"

-                     " all entries in post table are already parsed,"

-                     " using NULL for gid %d\n", n ));

-          len = 0;

-        }

+          break;

         else

         {

           FT_TRACE6(( "load_format_20: %d byte left in post table\n",

@@ -262,6 +257,19 @@

           goto Fail1;

         name_strings[n][len] = '\0';

+      }

+

+      if ( n < num_names )

+      {

+        FT_ERROR(( "load_format_20:"

+                   " all entries in post table are already parsed,"

+                   " using NULL names for gid %d - %d\n",

+                    n, num_names - 1 ));

+        for ( ; n < num_names; n++ )

+          if ( FT_NEW_ARRAY( name_strings[n], 1 ) )

+            goto Fail1;

+          else

+            name_strings[n][0] = '\0';

       }

     }