[freetype2-demos] master 45331a3: Fix some clang warnings.

[Werner LEMBERG]

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

    Fix some clang warnings.
    
    * graph/grfill.c (grFillRect): Use `int' for `size'.
    
    * src/ftstring.c (flower_init): Use `unsigned int' for `i'.
    Simplify some loops.
    
    * src/ftview.c (parse_cmdline) <'L'>: Use `unsigned char' casts.
    (main): Add `FT_LcdFilter' cast.
---
 ChangeLog      | 12 ++++++++++++
 graph/grfill.c |  4 ++--
 src/ftstring.c | 21 ++++++++++++---------
 src/ftview.c   | 13 +++++++------
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 197835b..9f4ca4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-07-03  Werner Lemberg  <address@hidden>
+
+       Fix some clang warnings.
+
+       * graph/grfill.c (grFillRect): Use `int' for `size'.
+
+       * src/ftstring.c (flower_init): Use `unsigned int' for `i'.
+       Simplify some loops.
+
+       * src/ftview.c (parse_cmdline) <'L'>: Use `unsigned char' casts.
+       (main): Add `FT_LcdFilter' cast.
+
 2018-07-02  Hugh McMaster  <address@hidden>
 
        Fix memory leak (patch #9666).
diff --git a/graph/grfill.c b/graph/grfill.c
index 1ab0de5..d2fa74b 100644
--- a/graph/grfill.c
+++ b/graph/grfill.c
@@ -231,7 +231,7 @@ grFillRect( grBitmap*   target,
   int              delta;
   unsigned char*   line;
   grFillHLineFunc  hline_func;
-  size_t           size = 0;
+  int              size = 0;
 
   if ( x < 0 )
   {
@@ -271,7 +271,7 @@ grFillRect( grBitmap*   target,
     size += 2;
     hline_func( line, x, width, color );
     for ( line += size * x; --height > 0; line += target->pitch )
-      memcpy( line + target->pitch, line, size * width );
+      memcpy( line + target->pitch, line, (size_t)size * (size_t)width );
     break;
 
   case gr_pixel_mode_gray:
diff --git a/src/ftstring.c b/src/ftstring.c
index 9bf3f96..8c799b1 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -108,16 +108,17 @@
 
 
   static void
-  flower_init( FT_Glyph*   glyph,
-               FT_F26Dot6  radius,
-               int         i,
-               int         v,
-               int         w,
-               int         reflect,
-               char        order )
+  flower_init( FT_Glyph*     glyph,
+               FT_F26Dot6    radius,
+               unsigned int  i,
+               int           v,
+               int           w,
+               int           reflect,
+               char          order )
   {
     FT_Outline*  outline;
     FT_Vector*   vec;
+    FT_Vector*   limit;
     char*        tag;
     FT_Fixed     s = FT_Sin( FT_ANGLE_PI4 / i );
     FT_Pos       b, d, p = 0, q = radius;
@@ -152,12 +153,14 @@
        q = d;
     }
 
+    limit = outline->points + outline->n_points;
+
     if ( reflect & 1 )
-      for( vec = outline->points, i = 0; i < outline->n_points; i++, vec++ )
+      for( vec = outline->points; vec < limit; vec++ )
         vec->x = -vec->x;
 
     if ( reflect & 2 )
-      for( vec = outline->points, i = 0; i < outline->n_points; i++, vec++ )
+      for( vec = outline->points; vec < limit; vec++ )
         vec->y = -vec->y;
   }
 
diff --git a/src/ftview.c b/src/ftview.c
index 14947ff..cd39247 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1752,11 +1752,11 @@
                                FT_Err_Unimplemented_Feature    &&
                i == 5                                          )
           {
-            status.filter_weights[0] = buf[0];
-            status.filter_weights[1] = buf[1];
-            status.filter_weights[2] = buf[2];
-            status.filter_weights[3] = buf[3];
-            status.filter_weights[4] = buf[4];
+            status.filter_weights[0] = (unsigned char)buf[0];
+            status.filter_weights[1] = (unsigned char)buf[1];
+            status.filter_weights[2] = (unsigned char)buf[2];
+            status.filter_weights[3] = (unsigned char)buf[3];
+            status.filter_weights[4] = (unsigned char)buf[4];
 
             FT_Library_SetLcdFilterWeights( handle->library,
                                             status.filter_weights );
@@ -1846,7 +1846,8 @@
     parse_cmdline( &argc, &argv );
 
     if ( status.lcd_filter != -1 )
-      FT_Library_SetLcdFilter( handle->library, status.lcd_filter );
+      FT_Library_SetLcdFilter( handle->library,
+                               (FT_LcdFilter)status.lcd_filter );
 
     /* get the default values as compiled into FreeType */
     FT_Property_Get( handle->library,