Attachment 151911 Details for Bug 235341 – patch to freetype to fix this

[patch] patch to freetype to fix this

freetype-2006-11-23_2006-11-24.patch (text/plain), 8.02 KB, created by Caolan McNamara on 2007-04-07 11:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-04-07 11:20:00 UTC

Size: 8.02 KB

patch

obsolete

>diff -ru freetype-2.2.1.orig/src/autofit/afhints.c freetype-2.2.1/src/autofit/afhints.c
>--- freetype-2.2.1.orig/src/autofit/afhints.c	2007-01-26 15:22:47.000000000 +0000
>+++ freetype-2.2.1/src/autofit/afhints.c	2007-01-26 15:22:57.000000000 +0000
>@@ -203,19 +203,18 @@
>       printf ( "Table of %s segments:\n",
>                dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
>       printf ( "  [ index |  pos |  dir  | link | serif |"
>-               " numl | first | start ]\n" );
>+               " height  | extra ]\n" );
> 
>       for ( seg = segments; seg < limit; seg++ )
>       {
>-        printf ( "  [ %5d | %4d | %5s | %4d | %5d | %4d | %5d | %5d ]\n",
>+        printf ( "  [ %5d | %4d | %5s | %4d | %5d | %5d | %5d ]\n",
>                  seg - segments,
>                  (int)seg->pos,
>                  af_dir_str( seg->dir ),
>                  AF_INDEX_NUM( seg->link, segments ),
>                  AF_INDEX_NUM( seg->serif, segments ),
>-                 (int)seg->num_linked,
>-                 seg->first - points,
>-                 seg->last - points );
>+                 seg->height,
>+                 seg->height - (seg->max_coord - seg->min_coord) );
>       }
>       printf( "\n" );
>     }
>diff -ru freetype-2.2.1.orig/src/autofit/afhints.h freetype-2.2.1/src/autofit/afhints.h
>--- freetype-2.2.1.orig/src/autofit/afhints.h	2007-01-26 15:22:48.000000000 +0000
>+++ freetype-2.2.1/src/autofit/afhints.h	2007-01-26 15:22:57.000000000 +0000
>@@ -125,6 +125,7 @@
>     FT_Short    pos;         /* position of segment                 */
>     FT_Short    min_coord;   /* minimum coordinate of segment       */
>     FT_Short    max_coord;   /* maximum coordinate of segment       */
>+    FT_Short    height;
> 
>     AF_Edge     edge;        /* the segment's parent edge           */
>     AF_Segment  edge_next;   /* link to next segment in parent edge */
>diff -ru freetype-2.2.1.orig/src/autofit/aflatin.c freetype-2.2.1/src/autofit/aflatin.c
>--- freetype-2.2.1.orig/src/autofit/aflatin.c	2007-01-26 15:22:47.000000000 +0000
>+++ freetype-2.2.1/src/autofit/aflatin.c	2007-01-26 15:27:27.000000000 +0000
>@@ -471,7 +471,7 @@
>       if ( blue )
>       {
>         FT_Pos  scaled = FT_MulFix( blue->shoot.org, scaler->y_scale );
>-        FT_Pos  fitted = FT_PIX_ROUND( scaled );
>+        FT_Pos  fitted = (scaled + 40) & ~63;
> 
> 
>         if ( scaled != fitted )
>@@ -717,6 +717,7 @@
> 
>             segment->min_coord = (FT_Short)min_pos;
>             segment->max_coord = (FT_Short)max_pos;
>+            segment->height    = segment->max_coord - segment->min_coord;
> 
>             on_edge = 0;
>             segment = NULL;
>@@ -767,6 +768,51 @@
> 
>     } /* contours */
> 
>+
>+   /* now slightly increase the height of segments when this makes sense
>+    * this is used to better detect and ignore serifs
>+    */
>+    {
>+      AF_Segment  segments      = axis->segments;
>+      AF_Segment  segments_end = segments + axis->num_segments;
>+
>+      for ( segment = segments; segment < segments_end; segment++ )
>+      {
>+        AF_Point  first = segment->first;
>+        AF_Point  last  = segment->last;
>+        FT_Pos    first_v = first->v;
>+        FT_Pos    last_v  = last->v;
>+
>+        if ( first == last )
>+          continue;
>+
>+        if ( first_v < last_v )
>+        {
>+          AF_Point  p;
>+
>+          p = first->prev;
>+          if ( p->v < first_v )
>+            segment->height += (first_v - p->v) >> 1;
>+
>+          p = last->next;
>+          if ( p->v > last_v )
>+            segment->height += (p->v - last_v) >> 1;
>+        }
>+        else
>+        {
>+          AF_Point  p;
>+
>+          p = first->prev;
>+          if ( p->v > first_v )
>+            segment->height += (p->v - first_v) >> 1;
>+
>+          p = last->next;
>+          if ( p->v < last_v )
>+            segment->height += (last_v - p->v) >> 1;
>+        }
>+      }
>+    }
>+
> #ifdef AF_HINT_METRICS
>     /* we need to ensure that there are edges on the left-most and  */
>     /* right-most points of the glyph in order to hint the metrics; */
>@@ -865,7 +911,7 @@
>     if ( len_threshold == 0 )
>       len_threshold = 1;
> 
>-    len_score = AF_LATIN_CONSTANT( hints->metrics, 3000 );
>+    len_score = AF_LATIN_CONSTANT( hints->metrics, 6000 );
> 
>     /* now compare each segment to the others */
>     for ( seg1 = segments; seg1 < segment_limit; seg1++ )
>@@ -953,7 +999,7 @@
>     AF_Direction  up_dir;
>     FT_Fixed      scale;
>     FT_Pos        edge_distance_threshold;
>-
>+    FT_Pos        segment_length_threshold;
> 
>     axis->num_edges = 0;
> 
>@@ -963,6 +1009,17 @@
>     up_dir = ( dim == AF_DIMENSION_HORZ ) ? AF_DIR_UP
>                                           : AF_DIR_RIGHT;
> 
>+    /*
>+     * We ignore all segments that are less than 1 pixels in length,
>+     * to avoid many problems with serif fonts.  We compute the
>+     * corresponding threshold in font units.
>+     */
>+    if ( dim == AF_DIMENSION_HORZ )
>+        segment_length_threshold = FT_DivFix( 96, hints->y_scale );
>+    else
>+        segment_length_threshold = 0;
>+
>+
>     /*********************************************************************/
>     /*                                                                   */
>     /* We will begin by generating a sorted table of edges for the       */
>@@ -992,6 +1049,8 @@
>       AF_Edge  found = 0;
>       FT_Int   ee;
> 
>+      if ( seg->height < segment_length_threshold )
>+        continue;
> 
>       /* look for an edge corresponding to the segment */
>       for ( ee = 0; ee < axis->num_edges; ee++ )
>@@ -1697,7 +1756,7 @@
>       /* now align the stem */
> 
>       /* this should not happen, but it's better to be safe */
>-      if ( edge2->blue_edge || edge2 < edge )
>+      if ( edge2->blue_edge )
>       {
>         af_latin_align_linked_edge( hints, dim, edge2, edge );
>         edge->flags |= AF_EDGE_DONE;
>@@ -1743,7 +1802,7 @@
>             cur_pos1 += d_off;
> 
>           edge->pos  = cur_pos1 - cur_len / 2;
>-          edge2->pos = cur_pos1 + cur_len / 2;
>+          edge2->pos = edge->pos + cur_len;
> 
>         }
>         else
>@@ -1904,20 +1963,58 @@
>        */
>       for ( edge = edges; edge < edge_limit; edge++ )
>       {
>+        FT_Pos  delta;
>+
>         if ( edge->flags & AF_EDGE_DONE )
>           continue;
> 
>+        delta = 1000;
>         if ( edge->serif )
>+        {
>+          delta = edge->serif->opos - edge->opos;
>+          if ( delta < 0 )
>+            delta = -delta;
>+        }
>+
>+        if ( delta < 64+16 )
>+        {
>           af_latin_align_serif_edge( hints, edge->serif, edge );
>+          AF_LOG(( "SERIF: edge %d (opos=%.2f) serif to %d (opos=%.2f) aligned to (%.2f)\n", edge-edges,
>+                   edge->opos/64., edge->serif - edges, edge->serif->opos/64., edge->pos/64.0 ));
>+        }
>         else if ( !anchor )
>         {
>+          AF_LOG(( "SERIF_ANCHOR: edge %d (opos=%.2f) snapped to (%.2f)\n",
>+                   edge-edges, edge->opos/64., edge->pos/64. ));
>           edge->pos = FT_PIX_ROUND( edge->opos );
>           anchor    = edge;
>         }
>         else
>-          edge->pos = anchor->pos +
>-                      FT_PIX_ROUND( edge->opos - anchor->opos );
>+        {
>+          AF_Edge   before, after;
>+
>+          for ( before = edge-1; before >= edges; before-- )
>+            if ( before->flags & AF_EDGE_DONE )
>+                break;
>+
>+          for ( after = edge+1; after < edge_limit; after++ )
>+            if ( after->flags & AF_EDGE_DONE )
>+                break;
> 
>+          if ( before >= edges && before < edge &&
>+               after  < edge_limit && after > edge )
>+          {
>+              edge->pos = before->pos + FT_MulDiv( edge->opos - before->opos,
>+                                                   after->pos - before->pos,
>+                                                   after->opos - before->opos );
>+          }
>+          else
>+              edge->pos = anchor->pos +
>+                          FT_PIX_ROUND( edge->opos - anchor->opos );
>+
>+          AF_LOG(( "SERIF_LINK: edge %d (opos=%.2f) snapped to (%.2f)\n",
>+                   edge-edges, edge->opos/64., edge->pos/64. ));
>+        }
>         edge->flags |= AF_EDGE_DONE;
> 
>         if ( edge > edges && edge->pos < edge[-1].pos )

Actions: View | Diff

Attachments on bug 235341: 151747 | 151748 | 151911