Update freetype to 2.5.4.

third_party/freetype/src/psaux/t1cmap.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1cmap.c                                                               */
 /*                                                                         */
 /*    Type 1 character map support (body).                                 */
 /*                                                                         */
 /*  Copyright 2002, 2003, 2006, 2007, 2012 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
 #include "t1cmap.h"
 
-#include "../../include/freetype/internal/ftdebug.h"
+#include FT_INTERNAL_DEBUG_H
 
 #include "psauxerr.h"
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
   /*****          TYPE1 STANDARD (AND EXPERT) ENCODING CMAPS           *****/
   /*****                                                               *****/
   /*************************************************************************/
@@ skipping 81 matching lines @@
     }
     char_code = 0;
 
   Exit:
     *pchar_code = char_code;
     return result;
   }
 
 
   FT_CALLBACK_DEF( FT_Error )
-  t1_cmap_standard_init( T1_CMapStd  cmap )
+  t1_cmap_standard_init( T1_CMapStd  cmap,
+                         FT_Pointer  pointer )
   {
+    FT_UNUSED( pointer );
+
+
     t1_cmap_std_init( cmap, 0 );
     return 0;
   }
 
 
   FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
   t1_cmap_standard_class_rec =
   {
     sizeof ( T1_CMapStdRec ),
 
     (FT_CMap_InitFunc)     t1_cmap_standard_init,
     (FT_CMap_DoneFunc)     t1_cmap_std_done,
     (FT_CMap_CharIndexFunc)t1_cmap_std_char_index,
     (FT_CMap_CharNextFunc) t1_cmap_std_char_next,
 
     NULL, NULL, NULL, NULL, NULL
   };
 
 
   FT_CALLBACK_DEF( FT_Error )
-  t1_cmap_expert_init( T1_CMapStd  cmap )
+  t1_cmap_expert_init( T1_CMapStd  cmap,
+                       FT_Pointer  pointer )
   {
+    FT_UNUSED( pointer );
+
+
     t1_cmap_std_init( cmap, 1 );
     return 0;
   }
 
   FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
   t1_cmap_expert_class_rec =
   {
     sizeof ( T1_CMapStdRec ),
 
     (FT_CMap_InitFunc)     t1_cmap_expert_init,
     (FT_CMap_DoneFunc)     t1_cmap_std_done,
     (FT_CMap_CharIndexFunc)t1_cmap_std_char_index,
     (FT_CMap_CharNextFunc) t1_cmap_std_char_next,
 
     NULL, NULL, NULL, NULL, NULL
   };
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
   /*****                    TYPE1 CUSTOM ENCODING CMAP                 *****/
   /*****                                                               *****/
   /*************************************************************************/
   /*************************************************************************/
 
 
   FT_CALLBACK_DEF( FT_Error )
-  t1_cmap_custom_init( T1_CMapCustom  cmap )
+  t1_cmap_custom_init( T1_CMapCustom  cmap,
+                       FT_Pointer     pointer )
   {
     T1_Face      face     = (T1_Face)FT_CMAP_FACE( cmap );
     T1_Encoding  encoding = &face->type1.encoding;
 
+    FT_UNUSED( pointer );
+
 
     cmap->first   = encoding->code_first;
     cmap->count   = (FT_UInt)( encoding->code_last - cmap->first );
     cmap->indices = encoding->char_index;
 
     FT_ASSERT( cmap->indices != NULL );
     FT_ASSERT( encoding->code_first <= encoding->code_last );
 
     return 0;
   }
@@ skipping 75 matching lines @@
 
   FT_CALLBACK_DEF( const char * )
   psaux_get_glyph_name( T1_Face  face,
                         FT_UInt  idx )
   {
     return face->type1.glyph_names[idx];
   }
 
 
   FT_CALLBACK_DEF( FT_Error )
-  t1_cmap_unicode_init( PS_Unicodes  unicodes )
+  t1_cmap_unicode_init( PS_Unicodes  unicodes,
+                        FT_Pointer   pointer )
   {
     T1_Face             face    = (T1_Face)FT_CMAP_FACE( unicodes );
     FT_Memory           memory  = FT_FACE_MEMORY( face );
     FT_Service_PsCMaps  psnames = (FT_Service_PsCMaps)face->psnames;
 
+    FT_UNUSED( pointer );
+
 
     return psnames->unicodes_init( memory,
                                    unicodes,
                                    face->type1.num_glyphs,
                                    (PS_GetGlyphNameFunc)&psaux_get_glyph_name,
                                    (PS_FreeGlyphNameFunc)NULL,
                                    (FT_Pointer)face );
   }
 
 
@@ skipping 41 matching lines @@
     (FT_CMap_InitFunc)     t1_cmap_unicode_init,
     (FT_CMap_DoneFunc)     t1_cmap_unicode_done,
     (FT_CMap_CharIndexFunc)t1_cmap_unicode_char_index,
     (FT_CMap_CharNextFunc) t1_cmap_unicode_char_next,
 
     NULL, NULL, NULL, NULL, NULL
   };
 
 
 /* END */