Update bundled freetype to 2.6.1

third_party/freetype/src/pshinter/pshglob.c

 /***************************************************************************/
 /*                                                                         */
 /*  pshglob.c                                                              */
 /*                                                                         */
 /*    PostScript hinter global hinting management (body).                  */
 /*    Inspired by the new auto-hinter module.                              */
 /*                                                                         */
-/*  Copyright 2001-2004, 2006, 2010, 2012-2014 by                          */
+/*  Copyright 2001-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 FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "pshglob.h"
 
 #ifdef DEBUG_HINTER
-  PSH_Globals  ps_debug_globals = 0;
+  PSH_Globals  ps_debug_globals = NULL;
 #endif
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
   /*****                       STANDARD WIDTHS                         *****/
   /*****                                                               *****/
   /*************************************************************************/
   /*************************************************************************/
@@ skipping 196 matching lines @@
   static void
   psh_blues_set_zones( PSH_Blues  target,
                        FT_UInt    count,
                        FT_Short*  blues,
                        FT_UInt    count_others,
                        FT_Short*  other_blues,
                        FT_Int     fuzz,
                        FT_Int     family )
   {
     PSH_Blue_Table  top_table, bot_table;
-    FT_Int          count_top, count_bot;
+    FT_UInt         count_top, count_bot;
 
 
     if ( family )
     {
       top_table = &target->family_top;
       bot_table = &target->family_bottom;
     }
     else
     {
       top_table = &target->normal_top;
@@ skipping 78 matching lines @@
 
           /* expand the top and bottom of intermediate zones;    */
           /* checking that the interval is smaller than the fuzz */
           top = zone->org_top;
 
           for ( count--; count > 0; count-- )
           {
             bot   = zone[1].org_bottom;
             delta = bot - top;
 
-            if ( delta < 2 * fuzz )
+            if ( delta / 2 < fuzz )
               zone[0].org_top = zone[1].org_bottom = top + delta / 2;
             else
             {
               zone[0].org_top    = top + fuzz;
               zone[1].org_bottom = bot - fuzz;
             }
 
             zone++;
             top = zone->org_top;
           }
 
           /* expand the top of the highest zone normally */
           zone->org_top = top + fuzz;
         }
         zone  = bot_table->zones;
         count = count_bot;
       }
     }
   }
 
 
   /* reset the blues table when the device transform changes */
   static void
   psh_blues_scale_zones( PSH_Blues  blues,
                          FT_Fixed   scale,
                          FT_Pos     delta )
   {
     FT_UInt         count;
     FT_UInt         num;
-    PSH_Blue_Table  table = 0;
+    PSH_Blue_Table  table = NULL;
 
     /*                                                        */
     /* Determine whether we need to suppress overshoots or    */
     /* not.  We simply need to compare the vertical scale     */
     /* parameter to the raw bluescale value.  Here is why:    */
     /*                                                        */
     /*   We need to suppress overshoots for all pointsizes.   */
     /*   At 300dpi that satisfies:                            */
     /*                                                        */
     /*      pointsize < 240*bluescale + 0.49                  */
@@ skipping 245 matching lines @@
       globals->dimension[1].stdw.count = 0;
 
       globals->blues.normal_top.count    = 0;
       globals->blues.normal_bottom.count = 0;
       globals->blues.family_top.count    = 0;
       globals->blues.family_bottom.count = 0;
 
       FT_FREE( globals );
 
 #ifdef DEBUG_HINTER
-      ps_debug_globals = 0;
+      ps_debug_globals = NULL;
 #endif
     }
   }
 
 
   static FT_Error
   psh_globals_new( FT_Memory     memory,
                    T1_Private*   priv,
                    PSH_Globals  *aglobals )
   {
@@ skipping 137 matching lines @@
   FT_LOCAL_DEF( void )
   psh_globals_funcs_init( PSH_Globals_FuncsRec*  funcs )
   {
     funcs->create    = psh_globals_new;
     funcs->set_scale = psh_globals_set_scale;
     funcs->destroy   = psh_globals_destroy;
   }
 
 
 /* END */