diff options
| author | Jungshik Shin <jungshik@google.com> | 2016-09-18 03:50:36 -0700 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-04-07 16:53:42 -0600 |
| commit | 3ff870b9dbbd88173df82269d3c1cffb1eba2eda (patch) | |
| tree | 0e443679e800bb442b2cbb2f7ae086b787ca65ff /module_option.diff | |
| parent | f720f0dbcf012d6c984dbbefa0875ef9840458c6 (diff) | |
| download | android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.tar.gz android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.tar.bz2 android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.zip | |
Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs)HEADreplicant-6.0-0002replicant-6.0-0001cm-13.0
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c38be52b
Keep all the configuration options as before.
Likewise, exclude unused files (Jamfiles, various mk files, builds/,
docs/, ChangeLog*, directories under src/ for disabled modules, etc).
Update README.android to record the configurations.
Besides, disable a new option (TT_CONFIG_OPTION_SUBPIXEL_HINTING) for
branches. Note that a bulk of changes in this CL come from the code to
implement this option.
BUG: 31470908
AOSP-Change-Id: I1ca90aec171d9580415b8531e2b767e9dd31164c
CVE-2016-10244
Change-Id: I4485d2ea543c52f8145ab23372cf3e5c7345879b
(cherry picked from commit 055aee28cedc3631434b2636fc6093c0d4d818ab)
Diffstat (limited to 'module_option.diff')
| -rw-r--r-- | module_option.diff | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/module_option.diff b/module_option.diff deleted file mode 100644 index 75079ce..0000000 --- a/module_option.diff +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/include/freetype/config/ftmodule.h b/include/freetype/config/ftmodule.h -index 76d271a..e145790 100644 ---- a/include/freetype/config/ftmodule.h -+++ b/include/freetype/config/ftmodule.h -@@ -12,14 +12,7 @@ - - FT_USE_MODULE( FT_Module_Class, autofit_module_class ) - FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) - FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) --FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) --FT_USE_MODULE( FT_Module_Class, psaux_module_class ) - FT_USE_MODULE( FT_Module_Class, psnames_module_class ) - FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) -@@ -27,6 +20,5 @@ FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) --FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) - - /* EOF */ -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index b481f8f..3819586 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -225,7 +225,7 @@ FT_BEGIN_HEADER - /* */ - /* Define this macro if you want to enable this `feature'. */ - /* */ --/* #define FT_CONFIG_OPTION_USE_PNG */ -+#define FT_CONFIG_OPTION_USE_PNG - - - /*************************************************************************/ -@@ -370,7 +370,7 @@ FT_BEGIN_HEADER - /* supply font data incrementally as the document is parsed, such */ - /* as the Ghostscript interpreter for the PostScript language. */ - /* */ --#define FT_CONFIG_OPTION_INCREMENTAL -+/* #define FT_CONFIG_OPTION_INCREMENTAL */ - - - /*************************************************************************/ -@@ -843,7 +843,7 @@ FT_BEGIN_HEADER - /* `warping' property of the auto-hinter (see file `ftautoh.h' for more */ - /* information; by default it is switched off). */ - /* */ --#define AF_CONFIG_OPTION_USE_WARPER -+/* #define AF_CONFIG_OPTION_USE_WARPER */ - - /* */ - |