[freetype2-demos] master 4d058c6: [ftview] Align with current FreeType.

[Alexei Podtelezhnikov]

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

    [ftview] Align with current FreeType.
    
    * src/ftview.c (write_header): s/GB2312/PRC/.
    (Process_Event): `FT_Library_SetLcdFilterWeights' now enables
    filtering without `FT_Library_SetLcdFilter'.
---
 ChangeLog    |    8 ++++++++
 src/ftview.c |    7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b611fab..2a697de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-27  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftview] Align with current FreeType.
+
+       * src/ftview.c (write_header): s/GB2312/PRC/.
+       (Process_Event): `FT_Library_SetLcdFilterWeights' now enables
+       filtering without `FT_Library_SetLcdFilter'.
+
 2016-12-30  Werner Lemberg  <address@hidden>
 
        * Version 2.7.1 released.
diff --git a/src/ftview.c b/src/ftview.c
index 72265d4..664d18b 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1369,7 +1369,6 @@
                                    (FT_LcdFilter)status.lcd_filter );
           break;
         default:
-          FT_Library_SetLcdFilter( handle->library, FT_LCD_FILTER_DEFAULT );
           FT_Library_SetLcdFilterWeights( handle->library,
                                           status.filter_weights );
           status.lcd_filter = -1;
@@ -1547,11 +1546,11 @@
       case FT_ENCODING_SJIS:
         encoding = "SJIS";
         break;
-      case FT_ENCODING_GB2312:
-        encoding = "GB 2312";
+      case FT_ENCODING_PRC:
+        encoding = "PRC";
         break;
       case FT_ENCODING_BIG5:
-        encoding = "Big 5";
+        encoding = "Big5";
         break;
       case FT_ENCODING_WANSUNG:
         encoding = "Wansung";