diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-18 03:53:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 03:53:35 +0000 |
| commit | 5d42c812008cbf91dcbacd53840bdd0c90824638 (patch) | |
| tree | ae363805e8be7812ad3a88ff8f28cd1380d7ac92 /src/autofit/afindic.c | |
| parent | 513d7bfe752f5167ec3fe0d4cca2c7949e229342 (diff) | |
| parent | 8e77a75afbfbe76ed641379d5f73b92cbf37d006 (diff) | |
| download | freetype-5d42c812008cbf91dcbacd53840bdd0c90824638.tar.gz | |
Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 6487a5bb15 am: 8e77a75afb
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273
Change-Id: Ic1776aff7be0afc5c84f9f61754023c5557998ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/autofit/afindic.c')
| -rw-r--r-- | src/autofit/afindic.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/autofit/afindic.c b/src/autofit/afindic.c index 289a09d71..7fb12c63d 100644 --- a/src/autofit/afindic.c +++ b/src/autofit/afindic.c @@ -28,9 +28,12 @@ static FT_Error - af_indic_metrics_init( AF_CJKMetrics metrics, - FT_Face face ) + af_indic_metrics_init( AF_StyleMetrics metrics_, /* AF_CJKMetrics */ + FT_Face face ) { + AF_CJKMetrics metrics = (AF_CJKMetrics)metrics_; + + /* skip blue zone init in CJK routines */ FT_CharMap oldmap = face->charmap; @@ -55,8 +58,8 @@ static void - af_indic_metrics_scale( AF_CJKMetrics metrics, - AF_Scaler scaler ) + af_indic_metrics_scale( AF_StyleMetrics metrics, + AF_Scaler scaler ) { /* use CJK routines */ af_cjk_metrics_scale( metrics, scaler ); @@ -64,8 +67,8 @@ static FT_Error - af_indic_hints_init( AF_GlyphHints hints, - AF_CJKMetrics metrics ) + af_indic_hints_init( AF_GlyphHints hints, + AF_StyleMetrics metrics ) { /* use CJK routines */ return af_cjk_hints_init( hints, metrics ); @@ -73,10 +76,10 @@ static FT_Error - af_indic_hints_apply( FT_UInt glyph_index, - AF_GlyphHints hints, - FT_Outline* outline, - AF_CJKMetrics metrics ) + af_indic_hints_apply( FT_UInt glyph_index, + AF_GlyphHints hints, + FT_Outline* outline, + AF_StyleMetrics metrics ) { /* use CJK routines */ return af_cjk_hints_apply( glyph_index, hints, outline, metrics ); @@ -87,10 +90,13 @@ /* metrics class. */ static void - af_indic_get_standard_widths( AF_CJKMetrics metrics, - FT_Pos* stdHW, - FT_Pos* stdVW ) + af_indic_get_standard_widths( AF_StyleMetrics metrics_, /* AF_CJKMetrics */ + FT_Pos* stdHW, + FT_Pos* stdVW ) { + AF_CJKMetrics metrics = (AF_CJKMetrics)metrics_; + + if ( stdHW ) *stdHW = metrics->axis[AF_DIMENSION_VERT].standard_width; |