[freetype2-demos] master e22573c: Fix clang warnings.

[Werner LEMBERG]

branch: master
commit e22573c745ce8965e7fe3e9fdad9a65603541f4b
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix clang warnings.
    
    We now have a new `FT_ENCODING_OTHER' tag used for internal
    purposes.  Since it is not possible to extend an enumeration after
    its definition, replace `FT_Encoding' types with `unsigned long'.
    
    * src/ftcommon.c (FTDemo_Make_Encoding_Tag): Updated.
    * src/ftcommon.h (FTDemo_Handle): Ditto.
    
    * src/ftmulti.c (encoding): Use `unsigned long'.
    (main): Updated.
    
    * src/ftstring.c (Sample): Make array of type `const char*'.
    (status): Use `unsigned long' for `encoding' field.
    Use `const char*' for `text' field.
    
    * src/ftview.c (status): Use `unsigned long' for `encoding'.
    (FT_ENCODING_OTHER): Use `unsigned long'.
---
 ChangeLog      |   21 +++++++++++++++++++++
 src/ftcommon.c |    4 ++--
 src/ftcommon.h |    4 ++--
 src/ftmulti.c  |    4 ++--
 src/ftstring.c |   30 +++++++++++++++---------------
 src/ftview.c   |    4 ++--
 6 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aacd1d1..742f23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2016-10-29  Werner Lemberg  <address@hidden>
+
+       Fix clang warnings.
+
+       We now have a new `FT_ENCODING_OTHER' tag used for internal
+       purposes.  Since it is not possible to extend an enumeration after
+       its definition, replace `FT_Encoding' types with `unsigned long'.
+
+       * src/ftcommon.c (FTDemo_Make_Encoding_Tag): Updated.
+       * src/ftcommon.h (FTDemo_Handle): Ditto.
+
+       * src/ftmulti.c (encoding): Use `unsigned long'.
+       (main): Updated.
+
+       * src/ftstring.c (Sample): Make array of type `const char*'.
+       (status): Use `unsigned long' for `encoding' field.
+       Use `const char*' for `text' field.
+
+       * src/ftview.c (status): Use `unsigned long' for `encoding'.
+       (FT_ENCODING_OTHER): Use `unsigned long'.
+
 2016-10-18  Alexei Podtelezhnikov  <address@hidden>
 
        [graph] Untested legacy 15/16-bit color fixes.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 1c00c45..71972fb 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -1387,7 +1387,7 @@
   }
 
 
-  FT_Encoding
+  unsigned long
   FTDemo_Make_Encoding_Tag( const char*  s )
   {
     int            i;
@@ -1402,7 +1402,7 @@
       l  += (unsigned long)s[i];
     }
 
-    return (FT_Encoding)l;
+    return l;
   }
 
 
diff --git a/src/ftcommon.h b/src/ftcommon.h
index e471dcc..21d0490 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -203,7 +203,7 @@
     int             string_length;
     int             string_reload;
 
-    FT_Encoding     encoding;
+    unsigned long   encoding;
     FT_Stroker      stroker;
     FT_Bitmap       bitmap;            /* used as bitmap conversion buffer */
 
@@ -335,7 +335,7 @@
 
 
   /* make a FT_Encoding tag from a string */
-  FT_Encoding
+  unsigned long
   FTDemo_Make_Encoding_Tag( const char*  s );
 
 
diff --git a/src/ftmulti.c b/src/ftmulti.c
index f97a48c..ab6196a 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -48,7 +48,7 @@
   static FT_Size       size;         /* the font size               */
   static FT_GlyphSlot  glyph;        /* the glyph slot              */
 
-  static FT_Encoding   encoding = FT_ENCODING_NONE;
+  static unsigned long  encoding = FT_ENCODING_NONE;
 
   static FT_Error      error;        /* error returned by FreeType? */
 
@@ -729,7 +729,7 @@
         break;
 
       case 'e':
-        encoding = (FT_Encoding)make_tag( optarg );
+        encoding = make_tag( optarg );
         break;
 
       case 'f':
diff --git a/src/ftstring.c b/src/ftstring.c
index f4f2469..45cb180 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -27,7 +27,7 @@
 #define MAXPTSIZE          500   /* dtp */
 
 
-  static char*  Sample[] =
+  static const char*  Sample[] =
   {
     "The quick brown fox jumps over the lazy dog",
 
@@ -80,24 +80,24 @@
 
   static struct  status_
   {
-    int          width;
-    int          height;
+    int  width;
+    int  height;
 
-    int          render_mode;
-    FT_Encoding  encoding;
-    int          res;
-    int          ptsize;            /* current point size */
-    double       gamma;
-    int          angle;
-    char*        text;
+    int            render_mode;
+    unsigned long  encoding;
+    int            res;
+    int            ptsize;            /* current point size */
+    double         gamma;
+    int            angle;
+    const char*    text;
 
     FTDemo_String_Context  sc;
 
-    FT_Byte      gamma_ramp[256];   /* for show only */
-    FT_Matrix    trans_matrix;
-    int          font_index;
-    char*        header;
-    char         header_buffer[256];
+    FT_Byte    gamma_ramp[256];   /* for show only */
+    FT_Matrix  trans_matrix;
+    int        font_index;
+    char*      header;
+    char       header_buffer[256];
 
   } status = { DIM_X, DIM_Y,
                RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, GAMMA, 0, NULL,
diff --git a/src/ftview.c b/src/ftview.c
index 4d4fac6..72265d4 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -88,7 +88,7 @@
     int            width;
     int            height;
     int            render_mode;
-    FT_Encoding    encoding;
+    unsigned long  encoding;
 
     int            res;
     int            ptsize;            /* current point size, 26.6 format */
@@ -126,7 +126,7 @@
   static FTDemo_Display*  display;
   static FTDemo_Handle*   handle;
 
-  static int FT_ENC_TAG( FT_ENCODING_OTHER, 'o', 't', 'h', 'e' );
+  static unsigned long  FT_ENC_TAG( FT_ENCODING_OTHER, 'o', 't', 'h', 'e' );
 
 
   /*