summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Podtelezhnikov <apodtele@gmail.com>2017-04-02 22:01:47 -0400
committerAlexei Podtelezhnikov <apodtele@gmail.com>2017-04-02 22:01:47 -0400
commite7b013044e18d7942af9d529a83d7fbb2d1da756 (patch)
treeb29395f3258f595e1526b501aad8e159021d7863
parentbb6c037bae83131c37c6255db7bdd8880047a6d5 (diff)
downloadfreetype2-e7b013044e18d7942af9d529a83d7fbb2d1da756.tar.gz
[autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'.
* src/autofit/aflatin.c (af_latin_hints_init): Updated. * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto.
-rw-r--r--ChangeLog7
-rw-r--r--src/autofit/aflatin.c6
-rw-r--r--src/autofit/aflatin2.c6
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c07da84de..f39195811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-02 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'.
+
+ * src/autofit/aflatin.c (af_latin_hints_init): Updated.
+ * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto.
+
2017-04-01 Werner Lemberg <wl@gnu.org>
* src/truetype/ttgload.c: Include FT_CONFIG_CONFIG_H.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 1b07b5b6c..11fa523c8 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -2584,14 +2584,14 @@
other_flags |= AF_LATIN_HINTS_MONO;
/*
- * In `light' hinting mode we disable horizontal hinting completely.
+ * In `light' or `lcd' mode we disable horizontal hinting completely.
* We also do it if the face is italic.
*
* However, if warping is enabled (which only works in `light' hinting
* mode), advance widths get adjusted, too.
*/
- if ( mode == FT_RENDER_MODE_LIGHT ||
- ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0 )
+ if ( mode == FT_RENDER_MODE_LIGHT || mode == FT_RENDER_MODE_LCD ||
+ ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0 )
scaler_flags |= AF_SCALER_FLAG_NO_HORIZONTAL;
#ifdef AF_CONFIG_OPTION_USE_WARPER
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index c215f29a7..0607278b1 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -1567,11 +1567,11 @@
other_flags |= AF_LATIN_HINTS_MONO;
/*
- * In `light' hinting mode we disable horizontal hinting completely.
+ * In `light' or `lcd' mode we disable horizontal hinting completely.
* We also do it if the face is italic.
*/
- if ( mode == FT_RENDER_MODE_LIGHT ||
- ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0 )
+ if ( mode == FT_RENDER_MODE_LIGHT || mode == FT_RENDER_MODE_LCD ||
+ ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0 )
scaler_flags |= AF_SCALER_FLAG_NO_HORIZONTAL;
#ifdef AF_CONFIG_OPTION_USE_WARPER