Update freetype to 2.5.4.

third_party/freetype/src/cff/cf2blues.c

 /***************************************************************************/
 /*                                                                         */
 /*  cf2blues.c                                                             */
 /*                                                                         */
 /*    Adobe's code for handling Blue Zones (body).                         */
 /*                                                                         */
-/*  Copyright 2009-2013 Adobe Systems Incorporated.                        */
+/*  Copyright 2009-2014 Adobe Systems Incorporated.                        */
 /*                                                                         */
 /*  This software, and all works of authorship, whether in source or       */
 /*  object code form as indicated by the copyright notice(s) included      */
 /*  herein (collectively, the "Work") is made available, and may only be   */
 /*  used, modified, and distributed under the FreeType Project License,    */
 /*  LICENSE.TXT.  Additionally, subject to the terms and conditions of the */
 /*  FreeType Project License, each contributor to the Work hereby grants   */
 /*  to any individual or legal entity exercising permissions granted by    */
 /*  the FreeType Project License and this section (hereafter, "You" or     */
 /*  "Your") a perpetual, worldwide, non-exclusive, no-charge,              */
@@ skipping 12 matching lines @@
 /*                                                                         */
 /*  By using, modifying, or distributing the Work you indicate that you    */
 /*  have read and understood the terms and conditions of the               */
 /*  FreeType Project License as well as those provided in this section,    */
 /*  and you accept them fully.                                             */
 /*                                                                         */
 /***************************************************************************/
 
 
 #include "cf2ft.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include FT_INTERNAL_DEBUG_H
 
 #include "cf2blues.h"
 #include "cf2hints.h"
 #include "cf2font.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 28 matching lines @@
     size_t  numFamilyOtherBlues;
 
     FT_Pos*  blueValues;
     FT_Pos*  otherBlues;
     FT_Pos*  familyBlues;
     FT_Pos*  familyOtherBlues;
 
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
 
+#if 0
     CF2_Int  unitsPerEm = font->unitsPerEm;
 
 
     if ( unitsPerEm == 0 )
       unitsPerEm = 1000;
+#endif
 
     FT_ZERO( blues );
     blues->scale = font->innerTransform.d;
 
     cf2_getBlueMetrics( decoder,
                         &blues->blueScale,
                         &blues->blueShift,
                         &blues->blueFuzz );
 
     cf2_getBlueValues( decoder, &numBlueValues, &blueValues );
@@ skipping 295 matching lines @@
      */
 
     if ( blues->scale < blues->blueScale )
     {
       blues->suppressOvershoot = TRUE;
 
       /* Change rounding threshold for `dsFlatEdge'.                    */
       /* Note: constant changed from 0.5 to 0.6 to avoid a problem with */
       /*       10ppem Arial                                             */
 
-      blues->boost = FT_MulFix(
-                       cf2_floatToFixed( .6 ),
-                       ( cf2_intToFixed( 1 ) -
-                         FT_DivFix( blues->scale,
-                                    blues->blueScale ) ) );
+      blues->boost = cf2_floatToFixed( .6 ) -
+                       FT_MulDiv( cf2_floatToFixed ( .6 ),
+                                  blues->scale,
+                                  blues->blueScale );
       if ( blues->boost > 0x7FFF )
       {
         /* boost must remain less than 0.5, or baseline could go negative */
         blues->boost = 0x7FFF;
       }
     }
 
     /* boost and darkening have similar effects; don't do both */
     if ( font->stemDarkened )
       blues->boost = 0;
@@ skipping 145 matching lines @@
         topHintEdge->dsCoord += dsMove;
         cf2_hint_lock( topHintEdge );
       }
     }
 
     return captured;
   }
 
 
 /* END */