[freetype2] master e7b0130: [autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'.

[Alexei Podtelezhnikov]

branch: master
commit e7b013044e18d7942af9d529a83d7fbb2d1da756
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [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.
---
 ChangeLog              | 7 +++++++
 src/autofit/aflatin.c  | 6 +++---
 src/autofit/aflatin2.c | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c07da84..f391958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-02  Alexei Podtelezhnikov  <address@hidden>
+
+       [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  <address@hidden>
 
        * src/truetype/ttgload.c: Include FT_CONFIG_CONFIG_H.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 1b07b5b..11fa523 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 c215f29..0607278 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