Update bundled freetype to 2.6.1

third_party/freetype/src/base/ftglyph.c

 /***************************************************************************/
 /*                                                                         */
 /*  ftglyph.c                                                              */
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs (body).              */
 /*                                                                         */
-/*  Copyright 1996-2005, 2007, 2008, 2010, 2012-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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 57 matching lines @@
     glyph->top  = slot->bitmap_top;
 
     /* do lazy copying whenever possible */
     if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
     {
       glyph->bitmap = slot->bitmap;
       slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
     }
     else
     {
-      FT_Bitmap_New( &glyph->bitmap );
+      FT_Bitmap_Init( &glyph->bitmap );
       error = FT_Bitmap_Copy( library, &slot->bitmap, &glyph->bitmap );
     }
 
   Exit:
     return error;
   }
 
 
   FT_CALLBACK_DEF( FT_Error )
   ft_bitmap_glyph_copy( FT_Glyph  bitmap_source,
@@ skipping 23 matching lines @@
 
 
   FT_CALLBACK_DEF( void )
   ft_bitmap_glyph_bbox( FT_Glyph  bitmap_glyph,
                         FT_BBox*  cbox )
   {
     FT_BitmapGlyph  glyph = (FT_BitmapGlyph)bitmap_glyph;
 
 
     cbox->xMin = glyph->left << 6;
-    cbox->xMax = cbox->xMin + ( glyph->bitmap.width << 6 );
+    cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
     cbox->yMax = glyph->top << 6;
-    cbox->yMin = cbox->yMax - ( glyph->bitmap.rows << 6 );
+    cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
   }
 
 
   FT_DEFINE_GLYPH(ft_bitmap_glyph_class,
     sizeof ( FT_BitmapGlyphRec ),
     FT_GLYPH_FORMAT_BITMAP,
 
     ft_bitmap_glyph_init,
     ft_bitmap_glyph_done,
     ft_bitmap_glyph_copy,
@@ skipping 24 matching lines @@
 
 
     /* check format in glyph slot */
     if ( slot->format != FT_GLYPH_FORMAT_OUTLINE )
     {
       error = FT_THROW( Invalid_Glyph_Format );
       goto Exit;
     }
 
     /* allocate new outline */
-    error = FT_Outline_New( library, source->n_points, source->n_contours,
+    error = FT_Outline_New( library,
+                            (FT_UInt)source->n_points,
+                            source->n_contours,
                             &glyph->outline );
     if ( error )
       goto Exit;
 
     FT_Outline_Copy( source, target );
 
   Exit:
     return error;
   }
 
@@ skipping 11 matching lines @@
   FT_CALLBACK_DEF( FT_Error )
   ft_outline_glyph_copy( FT_Glyph  outline_source,
                          FT_Glyph  outline_target )
   {
     FT_OutlineGlyph  source  = (FT_OutlineGlyph)outline_source;
     FT_OutlineGlyph  target  = (FT_OutlineGlyph)outline_target;
     FT_Error         error;
     FT_Library       library = FT_GLYPH( source )->library;
 
 
-    error = FT_Outline_New( library, source->outline.n_points,
-                            source->outline.n_contours, &target->outline );
+    error = FT_Outline_New( library,
+                            (FT_UInt)source->outline.n_points,
+                            source->outline.n_contours,
+                            &target->outline );
     if ( !error )
       FT_Outline_Copy( &source->outline, &target->outline );
 
     return error;
   }
 
 
   FT_CALLBACK_DEF( void )
   ft_outline_glyph_transform( FT_Glyph          outline_glyph,
                               const FT_Matrix*  matrix,
@@ skipping 60 matching lines @@
    static FT_Error
    ft_new_glyph( FT_Library             library,
                  const FT_Glyph_Class*  clazz,
                  FT_Glyph*              aglyph )
    {
      FT_Memory  memory = library->memory;
      FT_Error   error;
      FT_Glyph   glyph  = NULL;
 
 
-     *aglyph = 0;
+     *aglyph = NULL;
 
      if ( !FT_ALLOC( glyph, clazz->glyph_size ) )
      {
        glyph->library = library;
        glyph->clazz   = clazz;
        glyph->format  = clazz->glyph_format;
 
        *aglyph = glyph;
      }
 
@@ skipping 315 matching lines @@
 
       if ( clazz->glyph_done )
         clazz->glyph_done( glyph );
 
       FT_FREE( glyph );
     }
   }
 
 
 /* END */