diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2023-02-20 23:29:58 -0500 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2023-02-20 23:29:58 -0500 |
| commit | 7f9499044e3baa901de99251a007aa66e750b26c (patch) | |
| tree | c5bff2c1708cc544873eae180caf223d0fbdf9bd | |
| parent | 78464d1b0ce056bb35ff6f987657030a09c3d6ee (diff) | |
| download | freetype2-7f9499044e3baa901de99251a007aa66e750b26c.tar.gz | |
[autofit] Clean up contour indexing.
* src/autofit/aflatin.c (af_latin_metrics_init_blues): Refactor.
* src/autofit/afcjk.c (af_cjk_metrics_init_blues): Ditto.
| -rw-r--r-- | src/autofit/afcjk.c | 12 | ||||
| -rw-r--r-- | src/autofit/aflatin.c | 19 |
2 files changed, 13 insertions, 18 deletions
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index 5daefff35..7734d4e77 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -417,16 +417,14 @@ { FT_Int nn; - FT_Int first = 0; - FT_Int last = -1; + FT_Int pp, first, last; - for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ ) + last = -1; + for ( nn = 0; nn < outline.n_contours; nn++ ) { - FT_Int pp; - - - last = outline.contours[nn]; + first = last + 1; + last = outline.contours[nn]; /* Avoid single-point contours since they are never rasterized. */ /* In some fonts, they correspond to mark attachment points */ diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 4b3c59b3c..1082fee9a 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -496,23 +496,20 @@ /* now compute min or max point indices and coordinates */ points = outline.points; best_point = -1; + best_contour_first = -1; + best_contour_last = -1; best_y = 0; /* make compiler happy */ - best_contour_first = 0; /* ditto */ - best_contour_last = 0; /* ditto */ { FT_Int nn; - FT_Int first = 0; - FT_Int last = -1; + FT_Int pp, first, last; - for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ ) + last = -1; + for ( nn = 0; nn < outline.n_contours; nn++ ) { - FT_Int old_best_point = best_point; - FT_Int pp; - - - last = outline.contours[nn]; + first = last + 1; + last = outline.contours[nn]; /* Avoid single-point contours since they are never */ /* rasterized. In some fonts, they correspond to mark */ @@ -551,7 +548,7 @@ } } - if ( best_point != old_best_point ) + if ( best_point > best_contour_last ) { best_contour_first = first; best_contour_last = last; |