[freetype2-demos] master cc21431: Fix compilation warnings.

[Werner LEMBERG]

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

    Fix compilation warnings.
    
    Also do some minor formatting.
    
    * graph/batch/grbatch.c: Suppress warnings about unused variables.
    
    * src/*: Suppress warnings about dropping `const'.
---
 ChangeLog             | 10 ++++++++++
 graph/batch/grbatch.c | 46 ++++++++++++++++++++++++++++++++++------------
 src/ftcommon.c        | 18 ++++++++++--------
 src/ftgrid.c          |  2 +-
 src/ftstring.c        |  2 +-
 src/ftview.c          |  2 +-
 6 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9d4f60..4558593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2019-06-07  Werner Lemberg  <address@hidden>
+
+       Fix compilation warnings.
+
+       Also do some minor formatting.
+
+       * graph/batch/grbatch.c: Suppress warnings about unused variables.
+
+       * src/*: Suppress warnings about dropping `const'.
+
 2019-06-06  Alexei Podtelezhnikov  <address@hidden>
 
        [ftgrid,ftview,ftstring] Enable batch mode.
diff --git a/graph/batch/grbatch.c b/graph/batch/grbatch.c
index c7916f8..cafe289 100644
--- a/graph/batch/grbatch.c
+++ b/graph/batch/grbatch.c
@@ -29,47 +29,65 @@
     return 0;  /* success */
   }
 
+
   static void
   gr_batch_device_done( void )
   {
     /* nothing to do */
   }
 
+
   static void
   gr_batch_surface_set_title( grSurface*   surface,
-                            const char*  title_string )
+                              const char*  title_string )
   {
+    (void)surface;                   /* unused */
     printf( "%s\n", title_string );  /* prompt */
   }
 
+
   static void
-  gr_batch_surface_refresh_rect( grSurface* surface,
-                                 int x, int y, int width, int height )
+  gr_batch_surface_refresh_rect( grSurface*  surface,
+                                 int         x,
+                                 int         y,
+                                 int         width,
+                                 int         height )
   {
     /* no screen or window to refresh */
+
+    (void)surface;  /* unused */
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
   }
 
+
   static void
-  gr_batch_surface_done( grSurface* surface )
+  gr_batch_surface_done( grSurface*  surface )
   {
     grDoneBitmap( &(surface->bitmap) );
   }
 
+
   static int
-  gr_batch_surface_listen_event( grSurface* surface,
-                                 int event_mode,
-                                 grEvent* event )
+  gr_batch_surface_listen_event( grSurface*  surface,
+                                 int         event_mode,
+                                 grEvent*    event )
   {
-    event->type = gr_event_key;
+    (void)surface;    /* unused */
+    (void)event_mode;
 
-    event->key = grKEY( getchar() );
+    event->type = gr_event_key;
+    event->key  = grKEY( getchar() );
 
     return 1;
   }
 
+
   static int
-  gr_batch_surface_init( grSurface* surface,
-                         grBitmap* bitmap )
+  gr_batch_surface_init( grSurface*  surface,
+                         grBitmap*   bitmap )
   {
     if ( grNewBitmap( bitmap->mode, bitmap->grays,
                       bitmap->width, bitmap->rows, bitmap) )
@@ -89,9 +107,10 @@
     return 1;
   }
 
+
   grDevice  gr_batch_device =
   {
-    sizeof(grSurface),
+    sizeof( grSurface ),
     "batch",
 
     gr_batch_device_init,
@@ -102,3 +121,6 @@
     0,
     0
   };
+
+
+/* END */
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 89c69d0..81b5b4e 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -202,11 +202,12 @@
     int        height = bit->rows;
     int        color_type;
 
-    int code = 1;
-    FILE *fp = NULL;
-    png_structp png_ptr = NULL;
-    png_infop info_ptr = NULL;
-    png_bytep row = NULL;
+    int   code = 1;
+    FILE *fp   = NULL;
+
+    png_structp  png_ptr  = NULL;
+    png_infop    info_ptr = NULL;
+    png_bytep    row      = NULL;
 
 
     /* Set color_type */
@@ -267,12 +268,13 @@
     /* Record version string  */
     if ( ver_str != NULL )
     {
-      png_text text;
+      png_text  text;
 
 
       text.compression = PNG_TEXT_COMPRESSION_NONE;
-      text.key = "Software";
-      text.text = ver_str;
+      text.key         = (char *)"Software";
+      text.text        = ver_str;
+
       png_set_text( png_ptr, info_ptr, &text, 1 );
     }
 
diff --git a/src/ftgrid.c b/src/ftgrid.c
index f443e4a..0db4ee1 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -1403,7 +1403,7 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, "ftgrid.png", str );
+        FTDemo_Display_Print( display, (FT_String *)"ftgrid.png", str );
       }
       break;
 
diff --git a/src/ftstring.c b/src/ftstring.c
index 87f4d29..eb35a82 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -475,7 +475,7 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, "ftstring.png", str );
+        FTDemo_Display_Print( display, (FT_String *)"ftstring.png", str );
       }
       goto Exit;
 
diff --git a/src/ftview.c b/src/ftview.c
index 60fc2dc..ffbe974 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1171,7 +1171,7 @@
 
 
         FTDemo_Version( handle, str );
-        FTDemo_Display_Print( display, "ftview.png", str );
+        FTDemo_Display_Print( display, (FT_String *)"ftview.png", str );
       }
       status.update = 0;
       break;