Update freetype to latest version of ASOP.

src/base/ftstroke.c

 /***************************************************************************/
 /*                                                                         */
 /*  ftstroke.c                                                             */
 /*                                                                         */
 /*    FreeType path stroker (body).                                        */
 /*                                                                         */
-/*  Copyright 2002-2006, 2008-2011 by                                      */
+/*  Copyright 2002-2006, 2008-2011, 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 764 matching lines @@
 
   } FT_StrokerRec;
 
 
   /* documentation is in ftstroke.h */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Stroker_New( FT_Library   library,
                   FT_Stroker  *astroker )
   {
-    FT_Error    error;
+    FT_Error    error;           /* assigned in FT_NEW */
     FT_Memory   memory;
     FT_Stroker  stroker = NULL;
 
 
     if ( !library )
-      return FT_Err_Invalid_Argument;
+      return FT_THROW( Invalid_Argument );
 
     memory = library->memory;
 
     if ( !FT_NEW( stroker ) )
     {
       stroker->library = library;
 
       ft_stroke_border_init( &stroker->borders[0], memory );
       ft_stroke_border_init( &stroker->borders[1], memory );
     }
@@ skipping 310 matching lines @@
 
 
           /* compute middle point */
           FT_Vector_From_Polar( &middle,
                                 FT_MulFix( radius, stroker->miter_limit ),
                                 phi );
           middle.x += stroker->center.x;
           middle.y += stroker->center.y;
 
           /* compute first angle point */
-          length = FT_MulFix( radius,
-                              FT_DivFix( 0x10000L - sigma,
-                                         ft_pos_abs( FT_Sin( theta ) ) ) );
+          length = FT_MulDiv( radius, 0x10000L - sigma,
+                              ft_pos_abs( FT_Sin( theta ) ) );
 
           FT_Vector_From_Polar( &delta, length, phi + rotate );
           delta.x += middle.x;
           delta.y += middle.y;
 
           error = ft_stroke_border_lineto( border, &delta, FALSE );
           if ( error )
             goto Exit;
 
           /* compute second angle point */
@@ skipping 346 matching lines @@
               gamma = FT_Atan2( arc[0].x - end.x,   arc[0].y - end.y );
 
               bvec.x = end.x - start.x;
               bvec.y = end.y - start.y;
 
               blen = FT_Vector_Length( &bvec );
 
               sinA = ft_pos_abs( FT_Sin( alpha1 - gamma ) );
               sinB = ft_pos_abs( FT_Sin( beta - gamma ) );
 
-              alen = FT_DivFix( FT_MulFix( blen, sinA ), sinB );
+              alen = FT_MulDiv( blen, sinA, sinB );
 
               FT_Vector_From_Polar( &delta, alen, beta );
               delta.x += start.x;
               delta.y += start.y;
 
               /* circumnavigate the negative sector backwards */
               border->movable = FALSE;
               error = ft_stroke_border_lineto( border, &delta, FALSE );
               if ( error )
                 goto Exit;
@@ skipping 186 matching lines @@
               gamma = FT_Atan2( arc[0].x - end.x,   arc[0].y - end.y );
 
               bvec.x = end.x - start.x;
               bvec.y = end.y - start.y;
 
               blen = FT_Vector_Length( &bvec );
 
               sinA = ft_pos_abs( FT_Sin( alpha1 - gamma ) );
               sinB = ft_pos_abs( FT_Sin( beta - gamma ) );
 
-              alen = FT_DivFix( FT_MulFix( blen, sinA ), sinB );
+              alen = FT_MulDiv( blen, sinA, sinB );
 
               FT_Vector_From_Polar( &delta, alen, beta );
               delta.x += start.x;
               delta.y += start.y;
 
               /* circumnavigate the negative sector backwards */
               border->movable = FALSE;
               error = ft_stroke_border_lineto( border, &delta, FALSE );
               if ( error )
                 goto Exit;
@@ skipping 232 matching lines @@
                               FT_StrokerBorder  border,
                               FT_UInt          *anum_points,
                               FT_UInt          *anum_contours )
   {
     FT_UInt   num_points = 0, num_contours = 0;
     FT_Error  error;
 
 
     if ( !stroker || border > 1 )
     {
-      error = FT_Err_Invalid_Argument;
+      error = FT_THROW( Invalid_Argument );
       goto Exit;
     }
 
     error = ft_stroke_border_get_counts( stroker->borders + border,
                                          &num_points, &num_contours );
   Exit:
     if ( anum_points )
       *anum_points = num_points;
 
     if ( anum_contours )
@@ skipping 85 matching lines @@
     char*       tags;
 
     FT_Error    error;
 
     FT_Int      n;         /* index of contour in outline     */
     FT_UInt     first;     /* index of first point in contour */
     FT_Int      tag;       /* current point's state           */
 
 
     if ( !outline || !stroker )
-      return FT_Err_Invalid_Argument;
+      return FT_THROW( Invalid_Argument );
 
     FT_Stroker_Rewind( stroker );
 
     first = 0;
 
     for ( n = 0; n < outline->n_contours; n++ )
     {
       FT_UInt  last;  /* index of last point in contour */
 
 
@@ skipping 157 matching lines @@
 
       first = last + 1;
     }
 
     return FT_Err_Ok;
 
   Exit:
     return error;
 
   Invalid_Outline:
-    return FT_Err_Invalid_Outline;
+    return FT_THROW( Invalid_Outline );
   }
 
 
   /* declare an extern to access `ft_outline_glyph_class' globally     */
   /* allocated  in `ftglyph.c', and use the FT_OUTLINE_GLYPH_CLASS_GET */
   /* macro to access it when FT_CONFIG_OPTION_PIC is defined           */
 #ifndef FT_CONFIG_OPTION_PIC
   extern const FT_Glyph_Class  ft_outline_glyph_class;
 #endif
 #include "basepic.h"
 
 
   /* documentation is in ftstroke.h */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Glyph_Stroke( FT_Glyph    *pglyph,
                    FT_Stroker   stroker,
                    FT_Bool      destroy )
   {
-    FT_Error    error   = FT_Err_Invalid_Argument;
+    FT_Error    error   = FT_ERR( Invalid_Argument );
     FT_Glyph    glyph   = NULL;
     FT_Library  library = stroker->library;
 
     FT_UNUSED( library );
 
 
     if ( pglyph == NULL )
       goto Exit;
 
     glyph = *pglyph;
@@ skipping 55 matching lines @@
 
 
   /* documentation is in ftstroke.h */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Glyph_StrokeBorder( FT_Glyph    *pglyph,
                          FT_Stroker   stroker,
                          FT_Bool      inside,
                          FT_Bool      destroy )
   {
-    FT_Error    error   = FT_Err_Invalid_Argument;
+    FT_Error    error   = FT_ERR( Invalid_Argument );
     FT_Glyph    glyph   = NULL;
     FT_Library  library = stroker->library;
 
     FT_UNUSED( library );
 
 
     if ( pglyph == NULL )
       goto Exit;
 
     glyph = *pglyph;
@@ skipping 61 matching lines @@
 
     if ( !destroy )
       *pglyph = NULL;
 
   Exit:
     return error;
   }
 
 
 /* END */