Attachment 689537 Details for Bug 891457 – back ported fix to 2.4.11

[patch] back ported fix to 2.4.11

ft-2.4.11.diff (text/plain), 7.07 KB, created by Hin-Tak Leung on 2013-01-29 04:17:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hin-Tak Leung

Created: 2013-01-29 04:17:26 UTC

Size: 7.07 KB

patch

obsolete

>diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
>index a6a5e05..c1785f8 100644
>--- a/include/freetype/internal/ftcalc.h
>+++ b/include/freetype/internal/ftcalc.h
>@@ -125,7 +125,6 @@ FT_BEGIN_HEADER
>    *  A variant of FT_Vector_Transform.  See comments for
>    *  FT_Matrix_Multiply_Scaled.
>    */
>-
>   FT_BASE( void )
>   FT_Vector_Transform_Scaled( FT_Vector*        vector,
>                               const FT_Matrix*  matrix,
>@@ -156,6 +155,13 @@ FT_BEGIN_HEADER
>                      FT_Pos  out_y );
> 
> 
>+  /*
>+   *  Return the most significant bit index.
>+   */  
>+  FT_BASE( FT_Int )
>+  FT_MSB( FT_UInt32 z );
>+
>+
> #define INT_TO_F26DOT6( x )    ( (FT_Long)(x) << 6  )
> #define INT_TO_F2DOT14( x )    ( (FT_Long)(x) << 14 )
> #define INT_TO_FIXED( x )      ( (FT_Long)(x) << 16 )
>diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
>index 2aeea04..4122fda 100644
>--- a/src/base/ftcalc.c
>+++ b/src/base/ftcalc.c
>@@ -103,6 +103,42 @@
>   }
> 
> 
>+  FT_BASE_DEF ( FT_Int )
>+  FT_MSB( FT_UInt32 z )
>+  {
>+    FT_Int shift = 0;
>+
>+    /* determine msb bit index in `shift' */
>+    if ( z >= ( 1L << 16 ) )
>+    {
>+      z     >>= 16;
>+      shift  += 16;
>+    }
>+    if ( z >= ( 1L << 8 ) )
>+    {
>+      z     >>= 8;
>+      shift  += 8;
>+    }
>+    if ( z >= ( 1L << 4 ) )
>+    {
>+      z     >>= 4;
>+      shift  += 4;
>+    }
>+    if ( z >= ( 1L << 2 ) )
>+    {
>+      z     >>= 2;
>+      shift  += 2;
>+    }
>+    if ( z >= ( 1L << 1 ) )
>+    {
>+      z     >>= 1;
>+      shift  += 1;
>+    }
>+
>+    return shift;
>+  }
>+
>+
> #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
> 
>   /* documentation is in ftcalc.h */
>diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
>index c4fd266..73f517e 100644
>--- a/src/base/ftoutln.c
>+++ b/src/base/ftoutln.c
>@@ -930,10 +930,15 @@
>       v_prev  = points[last];
>       v_cur   = v_first;
> 
>-      /* compute the incoming vector and its length */
>+      /* compute the incoming normalized vector */
>       in.x = v_cur.x - v_prev.x;
>       in.y = v_cur.y - v_prev.y;
>       l_in = FT_Vector_Length( &in );
>+      if ( l_in )
>+      {
>+        in.x = FT_DivFix( in.x, l_in );
>+        in.y = FT_DivFix( in.y, l_in );
>+      }
> 
>       for ( n = first; n <= last; n++ )
>       {
>@@ -942,20 +947,25 @@
>         else
>           v_next = v_first;
> 
>-        /* compute the outgoing vector and its length */
>+        /* compute the outgoing normalized vector */
>         out.x = v_next.x - v_cur.x;
>         out.y = v_next.y - v_cur.y;
>         l_out = FT_Vector_Length( &out );
>+        if ( l_out )
>+        {
>+          out.x = FT_DivFix( out.x, l_out );
>+          out.y = FT_DivFix( out.y, l_out );
>+        }
> 
>-        d = l_in * l_out + in.x * out.x + in.y * out.y;
>+        d = FT_MulFix( in.x, out.x ) + FT_MulFix( in.y, out.y );
> 
>         /* shift only if turn is less then ~160 degrees */
>-        if ( 16 * d > l_in * l_out )
>+        if ( d > -0xF000L )
>         {
>           /* shift components are aligned along bisector        */
>           /* and directed according to the outline orientation. */
>-          shift.x = l_out * in.y + l_in * out.y;
>-          shift.y = l_out * in.x + l_in * out.x;
>+          shift.x = in.y + out.y;
>+          shift.y = in.x + out.x;
> 
>           if ( orientation == FT_ORIENTATION_TRUETYPE )
>             shift.x = -shift.x;
>@@ -964,17 +974,18 @@
> 
>           /* threshold strength to better handle collapsing segments */
>           l = FT_MIN( l_in, l_out );
>-          q = out.x * in.y - out.y * in.x;
>+          d = d + 0x10000L;
>+          q = FT_MulFix( out.x, in.y ) - FT_MulFix( out.y, in.x );
>           if ( orientation == FT_ORIENTATION_TRUETYPE )
>             q = -q;
> 
>-          if ( FT_MulDiv( xstrength, q, l ) < d )
>+          if ( FT_MulFix( xstrength, q ) <= FT_MulFix( d, l ) )
>             shift.x = FT_MulDiv( shift.x, xstrength, d );
>           else
>             shift.x = FT_MulDiv( shift.x, l, q );
> 
>           
>-          if ( FT_MulDiv( ystrength, q, l ) < d )
>+          if ( FT_MulFix( ystrength, q ) <= FT_MulFix( d, l ) )
>             shift.y = FT_MulDiv( shift.y, ystrength, d );
>           else
>             shift.y = FT_MulDiv( shift.y, l, q );
>@@ -1002,6 +1013,8 @@
>   FT_EXPORT_DEF( FT_Orientation )
>   FT_Outline_Get_Orientation( FT_Outline*  outline )
>   {
>+    FT_BBox     cbox;
>+    FT_Int      xshift, yshift;
>     FT_Vector*  points;
>     FT_Vector   v_prev, v_cur;
>     FT_Int      c, n, first;
>@@ -1016,6 +1029,14 @@
>     /* cubic or quadratic curves, this test deals with the polygon    */
>     /* only which is spanned up by the control points.                */
> 
>+    FT_Outline_Get_CBox( outline, &cbox );
>+
>+    xshift = FT_MSB( FT_ABS( cbox.xMax ) | FT_ABS( cbox.xMin ) ) - 14;
>+    xshift = FT_MAX( xshift, 0 );
>+
>+    yshift = FT_MSB( cbox.yMax - cbox.yMin ) - 14;
>+    yshift = FT_MAX( yshift, 0 );
>+
>     points = outline->points;
> 
>     first = 0;
>@@ -1029,7 +1050,8 @@
>       for ( n = first; n <= last; n++ )
>       {
>         v_cur = points[n];
>-        area += ( v_cur.y - v_prev.y ) * ( v_cur.x + v_prev.x );
>+        area += ( ( v_cur.y - v_prev.y ) >> yshift ) * 
>+                ( ( v_cur.x + v_prev.x ) >> xshift );
>         v_prev = v_cur;
>       }
> 
>diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c
>index 5239538..4c73576 100644
>--- a/src/base/fttrigon.c
>+++ b/src/base/fttrigon.c
>@@ -31,6 +31,7 @@
> 
>   /* the following is 0.607252935008887 * 2^30 */
> #define FT_TRIG_COSCALE  0x26DD3B6AUL
>+#define FT_TRIG_SAFE_MSB   27
> 
>   /* this table was generated for FT_PI = 180L << 16, i.e. degrees */
> #define FT_TRIG_MAX_ITERS  23
>@@ -104,85 +105,29 @@
>   static FT_Int
>   ft_trig_prenorm( FT_Vector*  vec )
>   {
>-    FT_Fixed  x, y, z;
>+    FT_Fixed  x, y;
>     FT_Int    shift;
> 
> 
>     x = vec->x;
>     y = vec->y;
> 
>-    z     = ( ( x >= 0 ) ? x : - x ) | ( (y >= 0) ? y : -y );
>-    shift = 0;
>+    shift = FT_MSB( FT_ABS( x ) | FT_ABS( y ) );
> 
>-#if 1
>-    /* determine msb bit index in `shift' */
>-    if ( z >= ( 1L << 16 ) )
>+    if ( shift <= FT_TRIG_SAFE_MSB )
>     {
>-      z     >>= 16;
>-      shift  += 16;
>-    }
>-    if ( z >= ( 1L << 8 ) )
>-    {
>-      z     >>= 8;
>-      shift  += 8;
>-    }
>-    if ( z >= ( 1L << 4 ) )
>-    {
>-      z     >>= 4;
>-      shift  += 4;
>-    }
>-    if ( z >= ( 1L << 2 ) )
>-    {
>-      z     >>= 2;
>-      shift  += 2;
>-    }
>-    if ( z >= ( 1L << 1 ) )
>-    {
>-      z    >>= 1;
>-      shift += 1;
>-    }
>-
>-    if ( shift <= 27 )
>-    {
>-      shift  = 27 - shift;
>+      shift  = FT_TRIG_SAFE_MSB - shift;
>       vec->x = x << shift;
>       vec->y = y << shift;
>     }
>     else
>     {
>-      shift -= 27;
>-      vec->x = x >> shift;
>-      vec->y = y >> shift;
>-      shift  = -shift;
>-    }
>-
>-#else /* 0 */
>-
>-    if ( z < ( 1L << 27 ) )
>-    {
>-      do
>-      {
>-        shift++;
>-        z <<= 1;
>-      } while ( z < ( 1L << 27 ) );
>-      vec->x = x << shift;
>-      vec->y = y << shift;
>-    }
>-    else if ( z > ( 1L << 28 ) )
>-    {
>-      do
>-      {
>-        shift++;
>-        z >>= 1;
>-      } while ( z > ( 1L << 28 ) );
>-
>+      shift -= FT_TRIG_SAFE_MSB;
>       vec->x = x >> shift;
>       vec->y = y >> shift;
>       shift  = -shift;
>     }
> 
>-#endif /* 0 */
>-
>     return shift;
>   }
>

Actions: View | Diff

Attachments on bug 891457: 671807 | 671809 | 671810 | 671811 | 671812 | 674513 | 677638 | 677639 | 677640 | 677641 | 677643 | 678118 | 678121 | 683564 | 689537 | 711682 | 711683