[freetype2-demos] master 6ebbaba 3/3: * src/ftlint.c (main, Analyze): Fix signed/unsigned mismatch.

[Werner Lemberg]

branch: master
commit 6ebbaba1b67a4a7ab0378e7eebc1e3abf2c4d87b
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/ftlint.c (main, Analyze): Fix signed/unsigned mismatch.
---
 ChangeLog    |  4 ++++
 src/ftlint.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6de1ac5..caea42b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2021-06-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       * src/ftlint.c (main, Analyze): Fix signed/unsigned mismatch.
+
+2021-06-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        [ftlint] Handle font collections.
 
        * src/ftlint.c (main): Increment face_index when possible.
diff --git a/src/ftlint.c b/src/ftlint.c
index d3c414b..148843b 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -81,7 +81,7 @@
     /* X-acutance */
     for ( b = bitmap->buffer, s1 = s2 = 0, i = 0; i < bitmap->rows; i++ )
     {
-      for ( d0 = d1 = 0, j = 0; j < bitmap->pitch; j++, b++ )
+      for ( d0 = d1 = 0, j = 0; j < bitmap->width; j++, b++ )
       {
         d1 -= *b;
         s2 += d1 >= d0 ? d1 - d0 : d0 - d1;  /* second derivative sum */
@@ -97,7 +97,7 @@
     printf( "X=%.4lf  ", s1 ? (double)s2 / s1 : 2.0 );
 
     /* Y-acutance */
-    for ( s1 = s2 = 0, j = 0; j < bitmap->pitch; j++ )
+    for ( s1 = s2 = 0, j = 0; j < bitmap->width; j++ )
     {
       b = bitmap->buffer + j;
       for ( d0 = d1 = 0, i = 0; i < bitmap->rows; i++, b += bitmap->pitch )
@@ -145,8 +145,8 @@
     char*         execname;
     char*         fname;
     int           opt;
-    int           first_index = 0;
-    int           last_index = ~0;
+    unsigned int  first_index = 0;
+    unsigned int  last_index = ~0;
     int           quiet = 0;
 
 
@@ -208,7 +208,7 @@
     argv += optind;
 
 
-    if( sscanf( argv[0], "%d", &ptsize) != 1)
+    if( sscanf( argv[0], "%d", &ptsize) != 1 )
       Usage( execname );
 
     error = FT_Init_FreeType( &library );