Fix `FT_LOCAL` and `FT_LOCAL_DEF` tags.

2 years ago · 663486a7ac
parent ac5babe876
commit 663486a7ac
9 changed files with 11 additions and 10 deletions
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@ -158,7 +158,7 @@ FT_BEGIN_HEADER
  FT_LOCAL( void )
  af_face_globals_free( AF_FaceGlobals  globals );

-  FT_LOCAL_DEF( FT_Bool )
+  FT_LOCAL( FT_Bool )
  af_face_globals_is_digit( AF_FaceGlobals  globals,
                            FT_UInt         gindex );

--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@ -193,7 +193,7 @@
  /* Get new edge for given axis, direction, and position, */
  /* without initializing the edge itself.                 */

-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
  af_axis_hints_new_edge( AF_AxisHints  axis,
                          FT_Int        fpos,
                          AF_Direction  dir,
--- a/src/autofit/afloader.h
+++ b/src/autofit/afloader.h
@ -75,7 +75,7 @@ FT_BEGIN_HEADER
                        FT_UInt    gindex,
                        FT_Int32   load_flags );

-  FT_LOCAL_DEF( FT_Fixed )
+  FT_LOCAL( FT_Fixed )
  af_loader_compute_darkening( AF_Loader  loader,
                               FT_Face    face,
                               FT_Pos     standard_width );
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@ -153,7 +153,7 @@
  }


-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
  cid_size_request( FT_Size          size,
                    FT_Size_Request  req )
  {
--- a/src/pfr/pfrsbit.c
+++ b/src/pfr/pfrsbit.c
@ -580,7 +580,7 @@
  /*************************************************************************/
  /*************************************************************************/

-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
  pfr_slot_load_bitmap( PFR_Slot  glyph,
                        PFR_Size  size,
                        FT_UInt   glyph_index,
--- a/src/psaux/afmparse.c
+++ b/src/psaux/afmparse.c
@ -563,7 +563,7 @@
  }


-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
  afm_parser_done( AFM_Parser  parser )
  {
    FT_Memory  memory = parser->memory;
--- a/src/pshinter/pshrec.c
+++ b/src/pshinter/pshrec.c
@ -765,7 +765,7 @@


  /* destroy hints */
-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
  ps_hints_done( PS_Hints  hints )
  {
    FT_Memory  memory = hints->memory;
@ -779,7 +779,7 @@
  }


-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
  ps_hints_init( PS_Hints   hints,
                 FT_Memory  memory )
  {
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@ -3879,13 +3879,14 @@
  }


-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
  tt_get_cmap_info( FT_CharMap    charmap,
                    TT_CMapInfo  *cmap_info )
  {
    FT_CMap        cmap  = (FT_CMap)charmap;
    TT_CMap_Class  clazz = (TT_CMap_Class)cmap->clazz;

+
    if ( clazz->get_cmap_info )
      return clazz->get_cmap_info( charmap, cmap_info );
    else
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@ -1593,7 +1593,7 @@
    return error;
  }

-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
  tt_face_load_sbit_image( TT_Face              face,
                           FT_ULong             strike_index,
                           FT_UInt              glyph_index,