diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-08-08 17:55:11 -0400 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:41:37 -0700 |
| commit | b5dc5490f5ac40a661faf6066223a3a978375369 (patch) | |
| tree | 86c9ee0214cac2870a94905e4240732413ed768b /src/autofit/afdummy.c | |
| parent | 0e0d6b5b627150577c9f4486b3ba97f9778799ca (diff) | |
| download | android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.tar.gz android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.tar.bz2 android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.zip | |
Update freetype to e1394d56752cac3bd68ab2358a8e1384ce7b9aaa
Integrated patches from freetype2 git repository, up to hashval
e1394d56752cac3bd68ab2358a8e1384ce7b9aaa, which is post-2.5.3.
Most recent commit message from freetype git:
Minor documentation improvement.
Noteworthy patches included:
Fix Savannah bug #41697, part 2.
Fix Savannah bug #41697, part 1.
RM-154
Bug: 16575323
Change-Id: I4f8f9375afd2540618b3ebf6152d77b743975dce
(cherry picked from commit 391103df1077dca897aef9efa1c80318334c9ade)
Diffstat (limited to 'src/autofit/afdummy.c')
| -rw-r--r-- | src/autofit/afdummy.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/autofit/afdummy.c b/src/autofit/afdummy.c index b2b3a20..f8702a1 100644 --- a/src/autofit/afdummy.c +++ b/src/autofit/afdummy.c @@ -23,8 +23,8 @@ static FT_Error - af_dummy_hints_init( AF_GlyphHints hints, - AF_ScriptMetrics metrics ) + af_dummy_hints_init( AF_GlyphHints hints, + AF_StyleMetrics metrics ) { af_glyph_hints_rescale( hints, metrics ); @@ -57,26 +57,14 @@ AF_WRITING_SYSTEM_DUMMY, - sizeof ( AF_ScriptMetricsRec ), + sizeof ( AF_StyleMetricsRec ), - (AF_Script_InitMetricsFunc) NULL, - (AF_Script_ScaleMetricsFunc)NULL, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) NULL, + (AF_WritingSystem_ScaleMetricsFunc)NULL, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_dummy_hints_init, - (AF_Script_ApplyHintsFunc) af_dummy_hints_apply - ) - - - AF_DEFINE_SCRIPT_CLASS( - af_none_script_class, - - AF_SCRIPT_NONE, - (AF_Blue_Stringset)0, - AF_WRITING_SYSTEM_DUMMY, - - NULL, - '\0' + (AF_WritingSystem_InitHintsFunc) af_dummy_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_dummy_hints_apply ) |