Update bundled freetype to 2.6.1

third_party/freetype/src/sfnt/pngshim.c

 /***************************************************************************/
 /*                                                                         */
 /*  pngshim.c                                                              */
 /*                                                                         */
 /*    PNG Bitmap glyph support.                                            */
 /*                                                                         */
-/*  Copyright 2013, 2014 by Google, Inc.                                   */
+/*  Copyright 2013-2015 by                                                 */
+/*  Google, Inc.                                                           */
 /*  Written by Stuart Gill and Behdad Esfahbod.                            */
 /*                                                                         */
 /*  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 11 matching lines @@
 #define PNG_SKIP_SETJMP_CHECK 1
 #include <png.h>
 #include "pngshim.h"
 
 #include "sferrors.h"
 
 
   /* This code is freely based on cairo-png.c.  There's so many ways */
   /* to call libpng, and the way cairo does it is defacto standard.  */
 
-  static int
-  multiply_alpha( int  alpha,
-                  int  color )
+  static unsigned int
+  multiply_alpha( unsigned int  alpha,
+                  unsigned int  color )
   {
-    int  temp = ( alpha * color ) + 0x80;
+    unsigned int  temp = alpha * color + 0x80;
 
 
     return ( temp + ( temp >> 8 ) ) >> 8;
   }
 
 
   /* Premultiplies data and converts RGBA bytes => native endian. */
   static void
   premultiply_data( png_structp    png,
                     png_row_infop  row_info,
@@ skipping 20 matching lines @@
         unsigned int  blue  = base[2];
 
 
         if ( alpha != 0xFF )
         {
           red   = multiply_alpha( alpha, red   );
           green = multiply_alpha( alpha, green );
           blue  = multiply_alpha( alpha, blue  );
         }
 
-        base[0] = blue;
-        base[1] = green;
-        base[2] = red;
-        base[3] = alpha;
+        base[0] = (unsigned char)blue;
+        base[1] = (unsigned char)green;
+        base[2] = (unsigned char)red;
+        base[3] = (unsigned char)alpha;
       }
     }
   }
 
 
   /* Converts RGBx bytes to BGRA. */
   static void
   convert_bytes_to_data( png_structp    png,
                          png_row_infop  row_info,
                          png_bytep      data )
   {
     unsigned int  i;
 
     FT_UNUSED( png );
 
 
     for ( i = 0; i < row_info->rowbytes; i += 4 )
     {
       unsigned char*  base  = &data[i];
       unsigned int    red   = base[0];
       unsigned int    green = base[1];
       unsigned int    blue  = base[2];
 
 
-      base[0] = blue;
-      base[1] = green;
-      base[2] = red;
+      base[0] = (unsigned char)blue;
+      base[1] = (unsigned char)green;
+      base[2] = (unsigned char)red;
       base[3] = 0xFF;
     }
   }
 
 
   /* Use error callback to avoid png writing to stderr. */
   static void
   error_callback( png_structp      png,
                   png_const_charp  error_msg )
   {
@@ skipping 125 matching lines @@
                   NULL, NULL );
 
     if ( error                                        ||
          ( !populate_map_and_metrics                &&
            ( (FT_Int)imgWidth  != metrics->width  ||
              (FT_Int)imgHeight != metrics->height ) ) )
       goto DestroyExit;
 
     if ( populate_map_and_metrics )
     {
-      FT_Long  size;
+      FT_ULong  size;
 
 
-      metrics->width  = (FT_Int)imgWidth;
-      metrics->height = (FT_Int)imgHeight;
+      metrics->width  = (FT_UShort)imgWidth;
+      metrics->height = (FT_UShort)imgHeight;
 
       map->width      = metrics->width;
       map->rows       = metrics->height;
       map->pixel_mode = FT_PIXEL_MODE_BGRA;
-      map->pitch      = map->width * 4;
+      map->pitch      = (int)( map->width * 4 );
       map->num_grays  = 256;
 
       /* reject too large bitmaps similarly to the rasterizer */
       if ( map->rows > 0x7FFF || map->width > 0x7FFF )
       {
         error = FT_THROW( Array_Too_Large );
         goto DestroyExit;
       }
 
       /* this doesn't overflow: 0x7FFF * 0x7FFF * 4 < 2^32 */
-      size = map->rows * map->pitch;
+      size = map->rows * (FT_ULong)map->pitch;
 
       error = ft_glyphslot_alloc_bitmap( slot, size );
       if ( error )
         goto DestroyExit;
     }
 
     /* convert palette/gray image to rgb */
     if ( color_type == PNG_COLOR_TYPE_PALETTE )
       png_set_palette_to_rgb( png );
 
@@ skipping 77 matching lines @@
     FT_Stream_Close( &stream );
 
   Exit:
     return error;
   }
 
 #endif /* FT_CONFIG_OPTION_USE_PNG */
 
 
 /* END */