[freetype2-demos] master 05bdcac: * src/ftcommon.[hc] (FTDemo_Display_Print): Use `const' qualifier.

[Alexei Podtelezhnikov]

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

    * src/ftcommon.[hc] (FTDemo_Display_Print): Use `const' qualifier.
    * src/ftdump.c (Print_Bytecode): Ditto.
    * src/ftmulti.c (new_header): Ditto.
    * src/ftstring.c (header): Ditto.
    * src/ft{view,grid,string}.c (Process_Event): Updated.
---
 ChangeLog      |  8 ++++++++
 src/ftcommon.c |  2 +-
 src/ftcommon.h |  2 +-
 src/ftdump.c   | 10 +++++-----
 src/ftgrid.c   |  2 +-
 src/ftmulti.c  | 24 ++++++++++++------------
 src/ftstring.c | 39 ++++++++++++++++++++-------------------
 src/ftview.c   |  2 +-
 8 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4558593..29f666e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-06-09  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftcommon.[hc] (FTDemo_Display_Print): Use `const' qualifier. 
+       * src/ftdump.c (Print_Bytecode): Ditto.
+       * src/ftmulti.c (new_header): Ditto.
+       * src/ftstring.c (header): Ditto.
+       * src/ft{view,grid,string}.c (Process_Event): Updated.
+
 2019-06-07  Werner Lemberg  <address@hidden>
 
        Fix compilation warnings.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 81b5b4e..7f42a9b 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -193,7 +193,7 @@
 
   int
   FTDemo_Display_Print( FTDemo_Display*  display,
-                        FT_String*       filename,
+                        const char*      filename,
                         FT_String*       ver_str )
   {
 #ifdef FT_CONFIG_OPTION_USE_PNG
diff --git a/src/ftcommon.h b/src/ftcommon.h
index 67ccff7..f9bdf5e 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -103,7 +103,7 @@
   /* dump display image in PNG format */
   int
   FTDemo_Display_Print( FTDemo_Display*  display,
-                        FT_String*       filename,
+                        const char*      filename,
                         FT_String*       ver_str );
 
   /*************************************************************************/
diff --git a/src/ftdump.c b/src/ftdump.c
index 1f220d4..37fdb2d 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -647,9 +647,9 @@
 
 
   static void
-  Print_Bytecode( FT_Byte*   buffer,
-                  FT_UShort  length,
-                  char*      tag )
+  Print_Bytecode( FT_Byte*     buffer,
+                  FT_UShort    length,
+                  const char*  tag )
   {
     FT_UShort  i;
     int        j = 0;  /* status counter */
@@ -714,7 +714,7 @@
       goto Exit;
 
     printf( "font program" );
-    Print_Bytecode( buffer, (FT_UShort)length, (char*)"fpgm" );
+    Print_Bytecode( buffer, (FT_UShort)length, "fpgm" );
 
   Prep:
     length = 0;
@@ -732,7 +732,7 @@
       goto Exit;
 
     printf( "\ncontrol value program" );
-    Print_Bytecode( buffer, (FT_UShort)length, (char*)"prep" );
+    Print_Bytecode( buffer, (FT_UShort)length, "prep" );
 
   Glyf:
     length = 0;
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 0db4ee1..f443e4a 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -1403,7 +1403,7 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, (FT_String *)"ftgrid.png", str );
+        FTDemo_Display_Print( display, "ftgrid.png", str );
       }
       break;
 
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 6d3d790..c7313bc 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -51,8 +51,8 @@
                                             unsigned int   delta );
 
 
-  static char   Header[256];
-  static char*  new_header = NULL;
+  static char         Header[256];
+  static const char*  new_header = NULL;
 
   static const unsigned char*  Text = (unsigned char*)
     "The quick brown fox jumps over the lazy dog 0123456789 "
@@ -618,22 +618,22 @@
 
     case grKEY( 'A' ):
       grouping = !grouping;
-      new_header = grouping ? (char *)"axis grouping is now on"
-                            : (char *)"axis grouping is now off";
+      new_header = grouping ? "axis grouping is now on"
+                            : "axis grouping is now off";
       set_up_axes();
       break;
 
     case grKEY( 'a' ):
       antialias  = !antialias;
-      new_header = antialias ? (char *)"anti-aliasing is now on"
-                             : (char *)"anti-aliasing is now off";
+      new_header = antialias ? "anti-aliasing is now on"
+                             : "anti-aliasing is now off";
       break;
 
     case grKEY( 'b' ):
       use_sbits  = !use_sbits;
       new_header = use_sbits
-                     ? (char *)"embedded bitmaps are now used if available"
-                     : (char *)"embedded bitmaps are now ignored";
+                     ? "embedded bitmaps are now used if available"
+                     : "embedded bitmaps are now ignored";
       break;
 
     case grKEY( 'n' ):
@@ -642,14 +642,14 @@
 
     case grKEY( 'h' ):
       hinted     = !hinted;
-      new_header = hinted ? (char *)"glyph hinting is now active"
-                          : (char *)"glyph hinting is now ignored";
+      new_header = hinted ? "glyph hinting is now active"
+                          : "glyph hinting is now ignored";
       break;
 
     case grKEY( ' ' ):
       render_mode ^= 1;
-      new_header   = render_mode ? (char *)"rendering all glyphs in font"
-                                 : (char *)"rendering test text string";
+      new_header   = render_mode ? "rendering all glyphs in font"
+                                 : "rendering test text string";
       break;
 
     case grKEY( 'H' ):
diff --git a/src/ftstring.c b/src/ftstring.c
index eb35a82..429f134 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -98,8 +98,9 @@
 
     FT_Matrix  trans_matrix;
     int        font_index;
-    char*      header;
-    char       header_buffer[256];
+
+    const char*  header;
+    char         header_buffer[256];
 
   } status = { "", DIM, NULL, RENDER_MODE_STRING, FT_ENCODING_UNICODE,
                72, 48, 0, NULL,
@@ -426,7 +427,7 @@
     switch ( status.render_mode )
     {
     case RENDER_MODE_KERNCMP:
-      status.header = (char *)"Kerning comparison";
+      status.header = "Kerning comparison";
       break;
 
     default:
@@ -475,29 +476,29 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, (FT_String *)"ftstring.png", str );
+        FTDemo_Display_Print( display, "ftstring.png", str );
       }
       goto Exit;
 
     case grKEY( 'b' ):
       handle->use_sbits = !handle->use_sbits;
       status.header     = handle->use_sbits
-                          ? (char *)"embedded bitmaps are now used when 
available"
-                          : (char *)"embedded bitmaps are now ignored";
+                          ? "embedded bitmaps are now used when available"
+                          : "embedded bitmaps are now ignored";
       goto Flags;
 
     case grKEY( 'f' ):
       handle->autohint = !handle->autohint;
       status.header     = handle->autohint
-                          ? (char *)"forced auto-hinting is now on"
-                          : (char *)"forced auto-hinting is now off";
+                          ? "forced auto-hinting is now on"
+                          : "forced auto-hinting is now off";
       goto Flags;
 
     case grKEY( 'h' ):
       handle->hinted = !handle->hinted;
       status.header   = handle->hinted
-                        ? (char *)"glyph hinting is now active"
-                        : (char *)"glyph hinting is now ignored";
+                        ? "glyph hinting is now active"
+                        : "glyph hinting is now ignored";
       goto Flags;
 
     case grKEY( 'l' ):
@@ -508,22 +509,22 @@
       sc->kerning_mode = ( sc->kerning_mode + 1 ) % N_KERNING_MODES;
       status.header =
         sc->kerning_mode == KERNING_MODE_SMART
-        ? (char *)"pair kerning and side bearing correction is now active"
+        ? "pair kerning and side bearing correction is now active"
         : sc->kerning_mode == KERNING_MODE_NORMAL
-          ? (char *)"pair kerning is now active"
-          : (char *)"pair kerning is now ignored";
+          ? "pair kerning is now active"
+          : "pair kerning is now ignored";
       goto String;
 
     case grKEY( 't' ):
       sc->kerning_degree = ( sc->kerning_degree + 1 ) % N_KERNING_DEGREES;
       status.header =
         sc->kerning_degree == KERNING_DEGREE_NONE
-        ? (char *)"no track kerning"
+        ? "no track kerning"
         : sc->kerning_degree == KERNING_DEGREE_LIGHT
-          ? (char *)"light track kerning active"
+          ? "light track kerning active"
           : sc->kerning_degree == KERNING_DEGREE_MEDIUM
-            ? (char *)"medium track kerning active"
-            : (char *)"tight track kerning active";
+            ? "medium track kerning active"
+            : "tight track kerning active";
       goto String;
 
     case grKeySpace:
@@ -538,8 +539,8 @@
     case grKEY( 'V' ):
       sc->vertical  = !sc->vertical;
       status.header = sc->vertical
-                      ? (char *)"using vertical layout"
-                      : (char *)"using horizontal layout";
+                      ? "using vertical layout"
+                      : "using horizontal layout";
       goto Exit;
 
     case grKEY( 'g' ):
diff --git a/src/ftview.c b/src/ftview.c
index ffbe974..60fc2dc 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1171,7 +1171,7 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, (FT_String *)"ftview.png", str );
+        FTDemo_Display_Print( display, "ftview.png", str );
       }
       status.update = 0;
       break;