Update bundled freetype to 2.6.1

third_party/freetype/src/type1/t1driver.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1driver.c                                                             */
 /*                                                                         */
 /*    Type 1 driver interface (body).                                      */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006, 2007, 2009, 2011, 2013, 2014 by             */
+/*  Copyright 1996-2015 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 <ft2build.h>
 #include "t1driver.h"
 #include "t1gload.h"
 #include "t1load.h"
 
 #include "t1errors.h"
 
 #ifndef T1_CONFIG_OPTION_NO_AFM
 #include "t1afm.h"
 #endif
 
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_STREAM_H
 
 #include FT_SERVICE_MULTIPLE_MASTERS_H
 #include FT_SERVICE_GLYPH_DICT_H
-#include FT_SERVICE_XFREE86_NAME_H
+#include FT_SERVICE_FONT_FORMAT_H
 #include FT_SERVICE_POSTSCRIPT_NAME_H
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
 #include FT_SERVICE_POSTSCRIPT_INFO_H
 #include FT_SERVICE_KERNING_H
 
 
   /*************************************************************************/
   /*                                                                       */
   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
   /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log  */
@@ skipping 123 matching lines @@
 
     return FT_Err_Ok;
   }
 
 
   static FT_Long
   t1_ps_get_font_value( FT_Face       face,
                         PS_Dict_Keys  key,
                         FT_UInt       idx,
                         void         *value,
-                        FT_Long       value_len )
+                        FT_Long       value_len_ )
   {
-    FT_Long  retval = -1;
+    FT_ULong  retval    = 0; /* always >= 1 if valid */
+    FT_ULong  value_len = value_len_ < 0 ? 0 : (FT_ULong)value_len_;
+
     T1_Face  t1face = (T1_Face)face;
     T1_Font  type1  = &t1face->type1;
 
 
     switch ( key )
     {
     case PS_DICT_FONT_TYPE:
       retval = sizeof ( type1->font_type );
       if ( value && value_len >= retval )
         *((FT_Byte *)value) = type1->font_type;
@@ skipping 26 matching lines @@
           }
           *((FT_Fixed *)value) = val;
         }
       }
       break;
 
     case PS_DICT_FONT_BBOX:
       if ( idx < sizeof ( type1->font_bbox ) /
                    sizeof ( type1->font_bbox.xMin ) )
       {
-        FT_Fixed val = 0;
+        FT_Fixed  val = 0;
 
 
         retval = sizeof ( val );
         if ( value && value_len >= retval )
         {
           switch ( idx )
           {
           case 0:
             val = type1->font_bbox.xMin;
             break;
@@ skipping 12 matching lines @@
       }
       break;
 
     case PS_DICT_PAINT_TYPE:
       retval = sizeof ( type1->paint_type );
       if ( value && value_len >= retval )
         *((FT_Byte *)value) = type1->paint_type;
       break;
 
     case PS_DICT_FONT_NAME:
-      retval = (FT_Long)( ft_strlen( type1->font_name ) + 1 );
+      retval = ft_strlen( type1->font_name ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_name ), retval );
       break;
 
     case PS_DICT_UNIQUE_ID:
       retval = sizeof ( type1->private_dict.unique_id );
       if ( value && value_len >= retval )
         *((FT_Int *)value) = type1->private_dict.unique_id;
       break;
 
     case PS_DICT_NUM_CHAR_STRINGS:
       retval = sizeof ( type1->num_glyphs );
       if ( value && value_len >= retval )
         *((FT_Int *)value) = type1->num_glyphs;
       break;
 
     case PS_DICT_CHAR_STRING_KEY:
       if ( idx < (FT_UInt)type1->num_glyphs )
       {
-        retval = (FT_Long)( ft_strlen( type1->glyph_names[idx] ) + 1 );
+        retval = ft_strlen( type1->glyph_names[idx] ) + 1;
         if ( value && value_len >= retval )
         {
           ft_memcpy( value, (void *)( type1->glyph_names[idx] ), retval );
           ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
         }
       }
       break;
 
     case PS_DICT_CHAR_STRING:
       if ( idx < (FT_UInt)type1->num_glyphs )
       {
-        retval = (FT_Long)( type1->charstrings_len[idx] + 1 );
+        retval = type1->charstrings_len[idx] + 1;
         if ( value && value_len >= retval )
         {
           ft_memcpy( value, (void *)( type1->charstrings[idx] ),
                      retval - 1 );
           ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
         }
       }
       break;
 
     case PS_DICT_ENCODING_TYPE:
       retval = sizeof ( type1->encoding_type );
       if ( value && value_len >= retval )
         *((T1_EncodingType *)value) = type1->encoding_type;
       break;
 
     case PS_DICT_ENCODING_ENTRY:
       if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY &&
            idx < (FT_UInt)type1->encoding.num_chars       )
       {
-        retval = (FT_Long)( ft_strlen( type1->encoding.char_name[idx] ) + 1 );
+        retval = ft_strlen( type1->encoding.char_name[idx] ) + 1;
         if ( value && value_len >= retval )
         {
           ft_memcpy( value, (void *)( type1->encoding.char_name[idx] ),
                      retval - 1 );
           ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
         }
       }
       break;
 
     case PS_DICT_NUM_SUBRS:
       retval = sizeof ( type1->num_subrs );
       if ( value && value_len >= retval )
         *((FT_Int *)value) = type1->num_subrs;
       break;
 
     case PS_DICT_SUBR:
       if ( idx < (FT_UInt)type1->num_subrs )
       {
-        retval = (FT_Long)( type1->subrs_len[idx] + 1 );
+        retval = type1->subrs_len[idx] + 1;
         if ( value && value_len >= retval )
         {
           ft_memcpy( value, (void *)( type1->subrs[idx] ), retval - 1 );
           ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
         }
       }
       break;
 
     case PS_DICT_STD_HW:
       retval = sizeof ( type1->private_dict.standard_width[0] );
@@ skipping 173 matching lines @@
         *((FT_UShort *)value) = type1->font_info.underline_thickness;
       break;
 
     case PS_DICT_FS_TYPE:
       retval = sizeof ( type1->font_extra.fs_type );
       if ( value && value_len >= retval )
         *((FT_UShort *)value) = type1->font_extra.fs_type;
       break;
 
     case PS_DICT_VERSION:
-      retval = (FT_Long)( ft_strlen( type1->font_info.version ) + 1 );
+      retval = ft_strlen( type1->font_info.version ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_info.version ), retval );
       break;
 
     case PS_DICT_NOTICE:
-      retval = (FT_Long)( ft_strlen( type1->font_info.notice ) + 1 );
+      retval = ft_strlen( type1->font_info.notice ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_info.notice ), retval );
       break;
 
     case PS_DICT_FULL_NAME:
-      retval = (FT_Long)( ft_strlen( type1->font_info.full_name ) + 1 );
+      retval = ft_strlen( type1->font_info.full_name ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_info.full_name ), retval );
       break;
 
     case PS_DICT_FAMILY_NAME:
-      retval = (FT_Long)( ft_strlen( type1->font_info.family_name ) + 1 );
+      retval = ft_strlen( type1->font_info.family_name ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_info.family_name ), retval );
       break;
 
     case PS_DICT_WEIGHT:
-      retval = (FT_Long)( ft_strlen( type1->font_info.weight ) + 1 );
+      retval = ft_strlen( type1->font_info.weight ) + 1;
       if ( value && value_len >= retval )
         ft_memcpy( value, (void *)( type1->font_info.weight ), retval );
       break;
 
     case PS_DICT_ITALIC_ANGLE:
       retval = sizeof ( type1->font_info.italic_angle );
       if ( value && value_len >= retval )
         *((FT_Long *)value) = type1->font_info.italic_angle;
       break;
     }
 
-    return retval;
+    return retval == 0 ? -1 : (FT_Long)retval;
   }
 
 
   static const FT_Service_PsInfoRec  t1_service_ps_info =
   {
     (PS_GetFontInfoFunc)   t1_ps_get_font_info,
     (PS_GetFontExtraFunc)  t1_ps_get_font_extra,
     (PS_HasGlyphNamesFunc) t1_ps_has_glyph_names,
     (PS_GetFontPrivateFunc)t1_ps_get_font_private,
     (PS_GetFontValueFunc)  t1_ps_get_font_value,
@@ skipping 10 matching lines @@
 
   /*
    *  SERVICE LIST
    *
    */
 
   static const FT_ServiceDescRec  t1_services[] =
   {
     { FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &t1_service_ps_name },
     { FT_SERVICE_ID_GLYPH_DICT,           &t1_service_glyph_dict },
-    { FT_SERVICE_ID_XF86_NAME,            FT_XF86_FORMAT_TYPE_1 },
+    { FT_SERVICE_ID_FONT_FORMAT,          FT_FONT_FORMAT_TYPE_1 },
     { FT_SERVICE_ID_POSTSCRIPT_INFO,      &t1_service_ps_info },
 
 #ifndef T1_CONFIG_OPTION_NO_AFM
     { FT_SERVICE_ID_KERNING,              &t1_service_kerning },
 #endif
 
 #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
     { FT_SERVICE_ID_MULTI_MASTERS,        &t1_service_multi_masters },
 #endif
     { NULL, NULL }
@@ skipping 110 matching lines @@
     Get_Kerning,
     T1_Read_Metrics,
 #endif
     T1_Get_Advances,
     T1_Size_Request,
     0                      /* FT_Size_SelectFunc     */
   };
 
 
 /* END */