[freetype2-demos] master 7511d5d: [ftview] Recognize other charmaps.

[Alexei Podtelezhnikov]

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

    [ftview] Recognize other charmaps.
    
    * src/smooth/ftgrays.c (event_change_encoding): Recognize when
    FT_ENCODING_NONE has special other meaning.
    (write_header): Default case for `status.encoding'.
---
 ChangeLog    |    8 ++++++++
 src/ftview.c |    7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4e5d2eb..52e9b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-10-09  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftview] Recognize other charmaps.
+
+       * src/smooth/ftgrays.c (event_change_encoding): Recognize when
+       FT_ENCODING_NONE has special other meaning.
+       (write_header): Default case for `status.encoding'.
+
 2016-10-07  Alexei Podtelezhnikov  <address@hidden>
 
        [ftview] Fix charmap cycling.
diff --git a/src/ftview.c b/src/ftview.c
index 4889dc8..4d4fac6 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -126,6 +126,8 @@
   static FTDemo_Display*  display;
   static FTDemo_Handle*   handle;
 
+  static int FT_ENC_TAG( FT_ENCODING_OTHER, 'o', 't', 'h', 'e' );
+
 
   /*
      In UTF-8 encoding:
@@ -1055,6 +1057,9 @@
     {
       status.encoding  = face->charmaps[font->cmap_index]->encoding;
       status.offset    = 0x20;
+
+      if ( status.encoding == FT_ENCODING_NONE )  /* OTHER, really */
+        status.encoding = FT_ENCODING_OTHER;
     }
     else
     {
@@ -1572,6 +1577,8 @@
       case FT_ENCODING_APPLE_ROMAN:
         encoding = "Apple Roman";
         break;
+      default:
+        encoding = "Other";
       }
       grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
                          encoding, display->fore_color );