[freetype2] master 54b5809: [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'.

[Alexei Podtelezhnikov]

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

    [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'.
    
    * include/freetype/freetype.h (FT_LOAD_TARGET_LCD): Document it.
    * src/autofit/afcjk.c (af_cjk_hints_init): Updated.
    * src/autofit/aflatin.c (af_latin_hints_init): Ditto.
    * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto.
---
 ChangeLog                   | 9 +++++++++
 include/freetype/freetype.h | 2 +-
 src/autofit/afcjk.c         | 4 ++--
 src/autofit/aflatin.c       | 4 ++--
 src/autofit/aflatin2.c      | 4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0e7a9b..e23f5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-31  Alexei Podtelezhnikov  <address@hidden>
+
+       [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'.
+
+       * include/freetype/freetype.h (FT_LOAD_TARGET_LCD): Document it.
+       * src/autofit/afcjk.c (af_cjk_hints_init): Updated.
+       * src/autofit/aflatin.c (af_latin_hints_init): Ditto.
+       * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto.
+
 2017-03-31  Werner Lemberg  <address@hidden>
 
        * src/cff/cffload.c (cff_font_load): Improve fix from 2017-01-04.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 7b65e21..21e2d31 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2940,7 +2940,7 @@ FT_BEGIN_HEADER
    *     in non-monochrome modes.
    *
    *   FT_LOAD_TARGET_LCD ::
-   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for horizontally
+   *     A variant of @FT_LOAD_TARGET_LIGHT optimized for horizontally
    *     decimated LCD displays.
    *
    *   FT_LOAD_TARGET_LCD_V ::
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index ec05ee4..61e29cd 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -1398,9 +1398,9 @@
       other_flags |= AF_LATIN_HINTS_VERT_SNAP;
 
     /*
-     *  We adjust stems to full pixels only if we don't use the `light' mode.
+     *  We adjust stems to full pixels unless in `light' or `lcd' mode.
      */
-    if ( mode != FT_RENDER_MODE_LIGHT )
+    if ( mode != FT_RENDER_MODE_LIGHT && mode != FT_RENDER_MODE_LCD )
       other_flags |= AF_LATIN_HINTS_STEM_ADJUST;
 
     if ( mode == FT_RENDER_MODE_MONO )
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index b983460..1b07b5b 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -2575,9 +2575,9 @@
       other_flags |= AF_LATIN_HINTS_VERT_SNAP;
 
     /*
-     *  We adjust stems to full pixels only if we don't use the `light' mode.
+     *  We adjust stems to full pixels unless in `light' or `lcd' mode.
      */
-    if ( mode != FT_RENDER_MODE_LIGHT )
+    if ( mode != FT_RENDER_MODE_LIGHT && mode != FT_RENDER_MODE_LCD )
       other_flags |= AF_LATIN_HINTS_STEM_ADJUST;
 
     if ( mode == FT_RENDER_MODE_MONO )
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index cc23126..c215f29 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -1558,9 +1558,9 @@
       other_flags |= AF_LATIN_HINTS_VERT_SNAP;
 
     /*
-     *  We adjust stems to full pixels only if we don't use the `light' mode.
+     *  We adjust stems to full pixels unless in `light' or `lcd' mode.
      */
-    if ( mode != FT_RENDER_MODE_LIGHT )
+    if ( mode != FT_RENDER_MODE_LIGHT && mode != FT_RENDER_MODE_LCD )
       other_flags |= AF_LATIN_HINTS_STEM_ADJUST;
 
     if ( mode == FT_RENDER_MODE_MONO )