[Git][freetype/freetype][master] 2 commits: [sfnt] Consolidate POST vers

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

9597a62b

by Alexei Podtelezhnikov at 2023-04-01T22:34:30-04:00

[sfnt] Consolidate POST version 2.0 and 2.5 (pt 1).

The deprecated POST version 2.5 can be handled using the data
structures of version 2.0.  The goal is to reduce the footprint.

* include/freetype/internal/tttypes.h (TT_Post_Names): Absorb and...
(TT_Post_20, TT_Post_25): ... remove these structures.
src/sfnt/ttpost.c (load_post_names, tt_face_get_ps_name,
tt_face_free_ps_names, load_format_20): Updated accordingly.
(load_format_25): ditto and convert offsets to glyph indices.

8f7b1455

by Alexei Podtelezhnikov at 2023-04-01T23:37:51-04:00

[sfnt] Consolidate POST version 2.0 and 2.5 (pt 2).

* src/sfnt/ttpost.c (load_format_20, load_format_25): Update arguments
and move shared calls and checks upstream to...
(load_post_names): ... this function.
(tt_face_free_ps_names, tt_face_get_ps_name): Updated.

2 changed files:

include/freetype/internal/tttypes.h
src/sfnt/ttpost.c

Changes:

include/freetype/internal/tttypes.h

@@ -779,13 +779,15 @@ FT_BEGIN_HEADER
    /**************************************************************************
+    *
     * @struct:
 -   *   TT_Post_20Rec
 +   *   TT_Post_NamesRec
+    *
     * @description:
 -   *   Postscript names sub-table, format 2.0.  Stores the PS name of each
 -   *   glyph in the font face.
 +   *   Postscript names table, either format 2.0 or 2.5.
+    *
     * @fields:
 +   *   loaded ::
 +   *     A flag to indicate whether the PS names are loaded.
 +   *
     *   num_glyphs ::
     *     The number of named glyphs in the table.
+    *
@@ -798,69 +800,14 @@ FT_BEGIN_HEADER
     *   glyph_names ::
     *     The PS names not in Mac Encoding.
     */
 -  typedef struct  TT_Post_20Rec_
 +  typedef struct  TT_Post_NamesRec_
+   {
 +    FT_Bool     loaded;
      FT_UShort   num_glyphs;
      FT_UShort   num_names;
      FT_UShort*  glyph_indices;
      FT_Byte**   glyph_names;
 -  } TT_Post_20Rec, *TT_Post_20;
+-
+-
 -  /**************************************************************************
 -   *
 -   * @struct:
 -   *   TT_Post_25Rec
 -   *
 -   * @description:
 -   *   Postscript names sub-table, format 2.5.  Stores the PS name of each
 -   *   glyph in the font face.
 -   *
 -   * @fields:
 -   *   num_glyphs ::
 -   *     The number of glyphs in the table.
 -   *
 -   *   offsets ::
 -   *     An array of signed offsets in a normal Mac Postscript name encoding.
 -   */
 -  typedef struct  TT_Post_25_
 -  {
 -    FT_UShort  num_glyphs;
 -    FT_Char*   offsets;
+-
 -  } TT_Post_25Rec, *TT_Post_25;
+-
+-
 -  /**************************************************************************
 -   *
 -   * @struct:
 -   *   TT_Post_NamesRec
 -   *
 -   * @description:
 -   *   Postscript names table, either format 2.0 or 2.5.
 -   *
 -   * @fields:
 -   *   loaded ::
 -   *     A flag to indicate whether the PS names are loaded.
 -   *
 -   *   format_20 ::
 -   *     The sub-table used for format 2.0.
 -   *
 -   *   format_25 ::
 -   *     The sub-table used for format 2.5.
 -   */
 -  typedef struct  TT_Post_NamesRec_
 -  {
 -    FT_Bool  loaded;
+-
 -    union
 -    {
 -      TT_Post_20Rec  format_20;
 -      TT_Post_25Rec  format_25;
+-
 -    } names;
+-
    } TT_Post_NamesRec, *TT_Post_Names;

src/sfnt/ttpost.c

@@ -156,64 +156,51 @@
    static FT_Error
 -  load_format_20( TT_Face    face,
 -                  FT_Stream  stream,
 -                  FT_ULong   post_len )
 +  load_format_20( TT_Post_Names  names,
 +                  FT_Stream      stream,
 +                  FT_UShort      num_glyphs,
 +                  FT_ULong       post_len )
+   {
      FT_Memory   memory = stream->memory;
      FT_Error    error;
 -    FT_UShort   num_glyphs;
 +    FT_UShort   n;
      FT_UShort   num_names = 0;
      FT_UShort*  glyph_indices = NULL;
      FT_Byte**   name_strings  = NULL;
 -    if ( FT_READ_USHORT( num_glyphs ) )
 -      goto Exit;
+-
 -    /* UNDOCUMENTED!  The number of glyphs in this table can be smaller */
 -    /* than the value in the maxp table (cf. cyberbit.ttf).             */
+-
 -    /* There already exist fonts which have more than 32768 glyph names */
 -    /* in this table, so the test for this threshold has been dropped.  */
+-
 -    if ( num_glyphs > face->max_profile.numGlyphs ||
 -         (FT_ULong)num_glyphs * 2 > post_len      )
 +    if ( (FT_ULong)num_glyphs * 2 > post_len )
+     {
        error = FT_THROW( Invalid_File_Format );
        goto Exit;
+     }
      /* load the indices and note their maximum */
 -    {
 -      FT_UShort  n;
 -      FT_UShort  idx;
+-
 +    if ( FT_QNEW_ARRAY( glyph_indices, num_glyphs ) ||
 +         FT_FRAME_ENTER( num_glyphs * 2 )           )
 +      goto Fail;
 -      if ( FT_QNEW_ARRAY( glyph_indices, num_glyphs ) ||
 -           FT_FRAME_ENTER( num_glyphs * 2 )           )
 -        goto Fail;
 +    for ( n = 0; n < num_glyphs; n++ )
 +    {
 +      FT_UShort  idx = FT_GET_USHORT();
 -      for ( n = 0; n < num_glyphs; n++ )
 -      {
 -        glyph_indices[n] = idx = FT_GET_USHORT();
 -        if ( idx > num_names )
 -          num_names = idx;
 -      }
 +      if ( idx > num_names )
 +        num_names = idx;
 -      FT_FRAME_EXIT();
 +      glyph_indices[n] = idx;
+     }
 +    FT_FRAME_EXIT();
++
      /* compute number of names stored in table */
      num_names = num_names > 257 ? num_names - 257 : 0;
      /* now load the name strings */
      if ( num_names )
+     {
 -      FT_UShort  n;
        FT_ULong   p;
        FT_Byte*   strings;
@@ -258,15 +245,11 @@
+     }
      /* all right, set table fields and exit successfully */
 -    {
 -      TT_Post_20  table = &face->postscript_names.names.format_20;
+-
 +    names->num_glyphs    = num_glyphs;
 +    names->num_names     = num_names;
 +    names->glyph_indices = glyph_indices;
 +    names->glyph_names   = name_strings;
 -      table->num_glyphs    = num_glyphs;
 -      table->num_names     = num_names;
 -      table->glyph_indices = glyph_indices;
 -      table->glyph_names   = name_strings;
 -    }
      return FT_Err_Ok;
    Fail:
@@ -279,65 +262,55 @@
    static FT_Error
 -  load_format_25( TT_Face    face,
 -                  FT_Stream  stream,
 -                  FT_ULong   post_len )
 +  load_format_25( TT_Post_Names  names,
 +                  FT_Stream      stream,
 +                  FT_UShort      num_glyphs,
 +                  FT_ULong       post_len )
+   {
      FT_Memory  memory = stream->memory;
      FT_Error   error;
 -    FT_UShort  num_glyphs;
 -    FT_Char*   offset_table = NULL;
+-
 +    FT_UShort   n;
 +    FT_UShort*  glyph_indices = NULL;
 -    if ( FT_READ_USHORT( num_glyphs ) )
 -      goto Exit;
      /* check the number of glyphs, including the theoretical limit */
 -    if ( num_glyphs > face->max_profile.numGlyphs ||
 -         num_glyphs > post_len                    ||
 -         num_glyphs > 257 + 128                   )
 +    if ( num_glyphs > post_len  ||
 +         num_glyphs > 258 + 128 )
+     {
        error = FT_THROW( Invalid_File_Format );
        goto Exit;
+     }
 -    if ( num_glyphs )
 +    /* load the indices and note their maximum */
 +    if ( FT_QNEW_ARRAY( glyph_indices, num_glyphs ) ||
 +         FT_FRAME_ENTER( num_glyphs )               )
 +      goto Fail;
++
 +    for ( n = 0; n < num_glyphs; n++ )
+     {
 -      FT_UShort  n;
 +      FT_Int  idx = n + FT_GET_CHAR();
 -      if ( FT_QNEW_ARRAY( offset_table, num_glyphs )  ||
 -           FT_STREAM_READ( offset_table, num_glyphs ) )
 -        goto Fail;
+-
 -      /* now check the offset table for out-of-range values */
 -      for ( n = 0; n < num_glyphs; n++ )
 +      if ( idx < 0 || idx > 257 )
+       {
 -        FT_Int  idx = n + offset_table[n];
+-
+-
 -        if ( idx < 0 || idx > 257 )
 -        {
 -          error = FT_THROW( Invalid_File_Format );
 -          goto Fail;
 -        }
 +        error = FT_THROW( Invalid_File_Format );
 +        goto Fail;
+       }
 -    }
 -    /* OK, set table fields and exit successfully */
 -    {
 -      TT_Post_25  table = &face->postscript_names.names.format_25;
 +      glyph_indices[n] = (FT_UShort)idx;
 +    }
 +    FT_FRAME_EXIT();
 -      table->num_glyphs = num_glyphs;
 -      table->offsets    = offset_table;
 -    }
 +    /* OK, set table fields and exit successfully */
 +    names->num_glyphs    = num_glyphs;
 +    names->glyph_indices = glyph_indices;
      return FT_Err_Ok;
    Fail:
 -    FT_FREE( offset_table );
 +    FT_FREE( glyph_indices );
    Exit:
      return error;
@@ -347,37 +320,37 @@
    static FT_Error
    load_post_names( TT_Face  face )
+   {
 -    FT_Stream  stream;
 -    FT_Error   error;
 -    FT_Fixed   format;
 +    FT_Error   error = FT_Err_Ok;
 +    FT_Stream  stream = face->root.stream;
 +    FT_Fixed   format = face->postscript.FormatType;
      FT_ULong   post_len;
 +    FT_UShort  num_glyphs;
 -    /* get a stream for the face's resource */
 -    stream = face->root.stream;
+-
      /* seek to the beginning of the PS names table */
      error = face->goto_table( face, TTAG_post, stream, &post_len );
      if ( error )
        goto Exit;
 -    format = face->postscript.FormatType;
+-
 -    /* go to beginning of subtable */
 -    if ( FT_STREAM_SKIP( 32 ) )
 +    /* UNDOCUMENTED!  The number of glyphs in this table can be smaller */
 +    /* than the value in the maxp table (cf. cyberbit.ttf).             */
 +    if ( post_len < 34                            ||
 +         FT_STREAM_SKIP( 32 )                     ||
 +         FT_READ_USHORT( num_glyphs )             ||
 +         num_glyphs > face->max_profile.numGlyphs ||
 +         num_glyphs == 0 )
        goto Exit;
 -    /* now read postscript table */
 -    if ( format == 0x00020000L && post_len >= 34 )
 -      error = load_format_20( face, stream, post_len - 34 );
 -    else if ( format == 0x00025000L && post_len >= 34 )
 -      error = load_format_25( face, stream, post_len - 34 );
 -    else
 -      error = FT_THROW( Invalid_File_Format );
+-
 -    face->postscript_names.loaded = 1;
 +    /* now read postscript names data */
 +    if ( format == 0x00020000L )
 +      error = load_format_20( &face->postscript_names, stream,
 +                              num_glyphs, post_len - 34 );
 +    else if ( format == 0x00025000L )
 +      error = load_format_25( &face->postscript_names, stream,
 +                              num_glyphs, post_len - 34 );
    Exit:
 +    face->postscript_names.loaded = 1;  /* even if failed */
      return error;
+   }
@@ -387,36 +360,20 @@
+   {
      FT_Memory      memory = face->root.memory;
      TT_Post_Names  names  = &face->postscript_names;
 -    FT_Fixed       format;
 -    if ( names->loaded )
 +    if ( names->num_glyphs )
+     {
 -      format = face->postscript.FormatType;
+-
 -      if ( format == 0x00020000L )
 -      {
 -        TT_Post_20  table = &names->names.format_20;
+-
+-
 -        FT_FREE( table->glyph_indices );
 -        table->num_glyphs = 0;
+-
 -        if ( table->num_names )
 -        {
 -          FT_FREE( table->glyph_names );
 -          table->num_names = 0;
 -        }
 -      }
 -      else if ( format == 0x00025000L )
 -      {
 -        TT_Post_25  table = &names->names.format_25;
+-
 +      FT_FREE( names->glyph_indices );
 +      names->num_glyphs = 0;
 +    }
 -        FT_FREE( table->offsets );
 -        table->num_glyphs = 0;
 -      }
 +    if ( names->num_names )
 +    {
 +      FT_FREE( names->glyph_names );
 +      names->num_names = 0;
+     }
++
      names->loaded = 0;
+   }
@@ -484,11 +441,9 @@
        if ( idx < 258 )                    /* paranoid checking */
          *PSname = MAC_NAME( idx );
+     }
 -    else if ( format == 0x00020000L )
 +    else if ( format == 0x00020000L ||
 +              format == 0x00025000L )
+     {
 -      TT_Post_20  table = &names->names.format_20;
+-
+-
        if ( !names->loaded )
+       {
          error = load_post_names( face );
@@ -496,32 +451,17 @@
            goto End;
+       }
 -      if ( idx < (FT_UInt)table->num_glyphs )
 +      if ( idx < (FT_UInt)names->num_glyphs )
+       {
 -        FT_UShort  name_index = table->glyph_indices[idx];
 +        FT_UShort  name_index = names->glyph_indices[idx];
          if ( name_index < 258 )
            *PSname = MAC_NAME( name_index );
 -        else
 -          *PSname = (FT_String*)table->glyph_names[name_index - 258];
 +        else  /* only for version 2.0 */
 +          *PSname = (FT_String*)names->glyph_names[name_index - 258];
+       }
+     }
 -    else if ( format == 0x00025000L )
 -    {
 -      TT_Post_25  table = &names->names.format_25;
+-
+-
 -      if ( !names->loaded )
 -      {
 -        error = load_post_names( face );
 -        if ( error )
 -          goto End;
 -      }
+-
 -      if ( idx < (FT_UInt)table->num_glyphs )    /* paranoid checking */
 -        *PSname = MAC_NAME( (FT_Int)idx + table->offsets[idx] );
 -    }
      /* nothing to do for format == 0x00030000L */

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] 2 commits: [sfnt] Consolidate POST version 2.0 and 2.5 (pt 1).
Date:	Sun, 02 Apr 2023 03:43:36 +0000