Update freetype to latest version of ASOP.

src/pshinter/pshalgo.c

 /***************************************************************************/
 /*                                                                         */
 /*  pshalgo.c                                                              */
 /*                                                                         */
 /*    PostScript hinting algorithm (body).                                 */
 /*                                                                         */
-/*  Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010   */
-/*            by                                                           */
+/*  Copyright 2001-2010, 2012, 2013 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 376 matching lines @@
 
 
 #ifdef DEBUG_HINTER
 
   static void
   ps_simple_scale( PSH_Hint_Table  table,
                    FT_Fixed        scale,
                    FT_Fixed        delta,
                    FT_Int          dimension )
   {
-    PSH_Hint  hint;
-    FT_UInt   count;
+    FT_UInt  count;
 
 
     for ( count = 0; count < table->max_hints; count++ )
     {
-      hint = table->hints + count;
+      PSH_Hint  hint = table->hints + count;
+
 
       hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta;
       hint->cur_len = FT_MulFix( hint->org_len, scale );
 
       if ( ps_debug_hint_func )
         ps_debug_hint_func( hint, dimension );
     }
   }
 
 #endif /* DEBUG_HINTER */
@@ skipping 134 matching lines @@
                  *                        = FT_FLOOR(stem_center-32+32)
                  *                        = FT_FLOOR(stem_center)
                  *   new_len              = 64
                  */
                 pos = FT_PIX_FLOOR( pos + ( len >> 1 ) );
                 len = 64;
               }
               else if ( len > 0 )
               {
                 /* This is a very small stem; we simply align it to the
-                 * pixel grid, trying to find the minimal displacement.
+                 * pixel grid, trying to find the minimum displacement.
                  *
                  * left               = pos
                  * right              = pos + len
                  * left_nearest_edge  = ROUND(pos)
                  * right_nearest_edge = ROUND(right)
                  *
                  * if ( ABS(left_nearest_edge - left) <=
                  *      ABS(right_nearest_edge - right) )
                  *    new_pos = left
                  * else
@@ skipping 578 matching lines @@
 
 
   static int
   psh_compute_dir( FT_Pos  dx,
                    FT_Pos  dy )
   {
     FT_Pos  ax, ay;
     int     result = PSH_DIR_NONE;
 
 
-    ax = ( dx >= 0 ) ? dx : -dx;
-    ay = ( dy >= 0 ) ? dy : -dy;
+    ax = FT_ABS( dx );
+    ay = FT_ABS( dy );
 
     if ( ay * 12 < ax )
     {
       /* |dy| <<< |dx|  means a near-horizontal segment */
       result = ( dx >= 0 ) ? PSH_DIR_RIGHT : PSH_DIR_LEFT;
     }
     else if ( ax * 12 < ay )
     {
       /* |dx| <<< |dy|  means a near-vertical segment */
       result = ( dy >= 0 ) ? PSH_DIR_UP : PSH_DIR_DOWN;
@@ skipping 1010 matching lines @@
     PSH_Glyph     glyph = &glyphrec;
     FT_Error      error;
 #ifdef DEBUG_HINTER
     FT_Memory     memory;
 #endif
     FT_Int        dimension;
 
 
     /* something to do? */
     if ( outline->n_points == 0 || outline->n_contours == 0 )
-      return PSH_Err_Ok;
+      return FT_Err_Ok;
 
 #ifdef DEBUG_HINTER
 
     memory = globals->memory;
 
     if ( ps_debug_glyph )
     {
       psh_glyph_done( ps_debug_glyph );
       FT_FREE( ps_debug_glyph );
     }
@@ skipping 89 matching lines @@
 
 #ifndef DEBUG_HINTER
     psh_glyph_done( glyph );
 #endif
 
     return error;
   }
 
 
 /* END */