Update freetype to 2.5.4.

third_party/freetype/src/psnames/psmodule.c

-#if !defined(_FXFT_VERSION_) || _FXFT_VERSION_ == 2501
 /***************************************************************************/
 /*                                                                         */
 /*  psmodule.c                                                             */
 /*                                                                         */
 /*    PSNames module implementation (body).                                */
 /*                                                                         */
 /*  Copyright 1996-2003, 2005-2008, 2012, 2013 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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
-#define FT2_BUILD_LIBRARY
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftobjs.h"
-#include "../../include/freetype/internal/services/svpscmap.h"
+
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H
 
 #include "psmodule.h"
 #include "pstables.h"
 
 #include "psnamerr.h"
 #include "pspic.h"
 
 
 #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
 
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
 
 #define VARIANT_BIT         0x80000000UL
 #define BASE_GLYPH( code )  ( (FT_UInt32)( (code) & ~VARIANT_BIT ) )
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+
   /* Return the Unicode value corresponding to a given glyph.  Note that */
   /* we do deal with glyph variants by detecting a non-initial dot in    */
   /* the name, as in `A.swash' or `e.final'; in this case, the           */
   /* VARIANT_BIT is set in the return value.                             */
   /*                                                                     */
-int FXFT_unicode_from_adobe_name( const char*  glyph_name )
+  static FT_UInt32
+  ps_unicode_value( const char*  glyph_name )
   {
     /* If the name begins with `uni', then the glyph name may be a */
     /* hard-coded unicode character code.                          */
     if ( glyph_name[0] == 'u' &&
          glyph_name[1] == 'n' &&
          glyph_name[2] == 'i' )
     {
       /* determine whether the next four characters following are */
       /* hexadecimal.                                             */
 
@@ skipping 97 matching lines @@
       }
 
       /* now look up the glyph in the Adobe Glyph List */
       if ( !dot )
         return (FT_UInt32)ft_get_adobe_glyph_index( glyph_name, p );
       else
         return (FT_UInt32)( ft_get_adobe_glyph_index( glyph_name, dot ) |
                             VARIANT_BIT );
     }
   }
-  #ifdef __cplusplus
-}
-#endif
 
-static int xyq_search_node(char* glyph_name, int name_offset, int table_offset, FT_UInt32 unicode)
-{
-        int i, count;
-
-        // copy letters
-        while (1) {
-                glyph_name[name_offset] = ft_adobe_glyph_list[table_offset] & 0x7f;
-                name_offset ++;
-                table_offset ++;
-                if (!(ft_adobe_glyph_list[table_offset-1] & 0x80)) break;
-        }
-        glyph_name[name_offset] = 0;
-
-        // get child count
-        count = ft_adobe_glyph_list[table_offset] & 0x7f;
-
-        // check if we have value for this node
-        if (ft_adobe_glyph_list[table_offset] & 0x80) {
-                unsigned short thiscode = ft_adobe_glyph_list[table_offset+1] * 256 + ft_adobe_glyph_list[table_offset+2];
-                if (thiscode == unicode)        // found it!
-                        return 1;
-                table_offset += 3;
-        } else
-                table_offset ++;
-
-        // now search in sub-nodes
-        if (count == 0) return 0;
-        for (i = 0; i < count; i ++) {
-                int child_offset = ft_adobe_glyph_list[table_offset+i*2] * 256 + ft_adobe_glyph_list[table_offset+i*2+1];
-                if (xyq_search_node(glyph_name, name_offset, child_offset, unicode))
-                        // found in child
-                        return 1;
-        }
-        return 0;
-}
-
-// XYQ: function for searching Unicode in the glyph list
-void FXFT_adobe_name_from_unicode(char* glyph_name, FT_UInt32 unicode)
-{
-        int i, count;
-        
-        // start from top level node
-        count = ft_adobe_glyph_list[1];
-        for (i = 0; i < count; i ++) {
-                int child_offset = ft_adobe_glyph_list[i*2+2] * 256 + ft_adobe_glyph_list[i*2+3];
-                if (xyq_search_node(glyph_name, 0, child_offset, unicode))
-                        return;
-        }
-
-        // failed, clear the buffer
-        glyph_name[0] = 0;
-}
 
   /* ft_qsort callback to sort the unicode map */
   FT_CALLBACK_DEF( int )
   compare_uni_maps( const void*  a,
                     const void*  b )
   {
     PS_UniMap*  map1 = (PS_UniMap*)a;
     PS_UniMap*  map2 = (PS_UniMap*)b;
     FT_UInt32   unicode1 = BASE_GLYPH( map1->unicode );
     FT_UInt32   unicode2 = BASE_GLYPH( map2->unicode );
@@ skipping 150 matching lines @@
 
       for ( n = 0; n < num_glyphs; n++ )
       {
         const char*  gname = get_glyph_name( glyph_data, n );
 
 
         if ( gname )
         {
           ps_check_extra_glyph_name( gname, n,
                                      extra_glyphs, extra_glyph_list_states );
-          uni_char = FXFT_unicode_from_adobe_name( gname );
+          uni_char = ps_unicode_value( gname );
 
           if ( BASE_GLYPH( uni_char ) != 0 )
           {
             ps_check_extra_glyph_unicode( uni_char,
                                           extra_glyph_list_states );
             map->unicode     = uni_char;
             map->glyph_index = n;
             map++;
           }
 
@@ skipping 171 matching lines @@
       return 0;
 
     return ft_standard_glyph_names + ft_sid_names[sid];
   }
 
 
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
   FT_DEFINE_SERVICE_PSCMAPSREC(
     pscmaps_interface,
-    (PS_Unicode_ValueFunc)     FXFT_unicode_from_adobe_name,
+    (PS_Unicode_ValueFunc)     ps_unicode_value,
     (PS_Unicodes_InitFunc)     ps_unicodes_init,
     (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index,
     (PS_Unicodes_CharNextFunc) ps_unicodes_char_next,
 
     (PS_Macintosh_NameFunc)    ps_get_macintosh_name,
     (PS_Adobe_Std_StringsFunc) ps_get_standard_strings,
 
     t1_standard_encoding,
     t1_expert_encoding )
 
@@ skipping 61 matching lines @@
     0x20000L,   /* driver requires FreeType 2 or above */
 
     PUT_PS_NAMES_SERVICE(
       (void*)&PSCMAPS_INTERFACE_GET ),   /* module specific interface */
     (FT_Module_Constructor)NULL,
     (FT_Module_Destructor) NULL,
     (FT_Module_Requester)  PUT_PS_NAMES_SERVICE( psnames_get_service ) )
 
 
 /* END */
-#endif
-