[freetype2-demos] master 228a7ea: [ftview] Fix `-l' option.

[Werner LEMBERG]

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

    [ftview] Fix `-l' option.
    
    * src/ftview.c (usage): Fix reported range.
    (parse_cmdline) <l>: Fix range checking.
    Set `handle->lcd_mode'; without this, there is no effect at
    start-up.
    
    * src/ftview.1: Fix argument range of `-l'.
---
 ChangeLog    | 11 +++++++++++
 src/ftview.1 |  2 +-
 src/ftview.c |  9 +++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b428c0b..3368703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-12-02  Werner Lemberg  <address@hidden>
+
+       [ftview] Fix `-l' option.
+
+       * src/ftview.c (usage): Fix reported range.
+       (parse_cmdline) <l>: Fix range checking.
+       Set `handle->lcd_mode'; without this, there is no effect at
+       start-up.
+
+       * src/ftview.1: Fix argument range of `-l'.
+
 2017-10-21  Alexei Podtelezhnikov  <address@hidden>
 
        * src/ttdebug.c: Fix compilation on Windows.
diff --git a/src/ftview.1 b/src/ftview.1
index b13a929..0c74c28 100644
--- a/src/ftview.1
+++ b/src/ftview.1
@@ -81,7 +81,7 @@ for rendering.
 .BI \-l \ mode
 Set start-up rendering mode (0 <=
 .I mode
-<= 5).
+<= 6).
 .
 .TP
 .B \-p
diff --git a/src/ftview.c b/src/ftview.c
index 8f30192..fbb947d 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1633,7 +1633,7 @@
       "  -m text   Use `text' for rendering.\n" );
     fprintf( stderr,
       "  -l mode   Set start-up rendering mode (0 <= mode <= %d).\n",
-             N_LCD_IDXS );
+             N_LCD_IDXS - 1 );
     fprintf( stderr,
       "  -p        Preload file in memory to simulate memory-mapping.\n"
       "\n"
@@ -1679,12 +1679,13 @@
 
       case 'l':
         status.lcd_idx = atoi( optarg );
-        if ( status.lcd_idx < 0 || status.lcd_idx > N_LCD_IDXS )
+        if ( status.lcd_idx < 0 || status.lcd_idx >= N_LCD_IDXS )
         {
-          fprintf( stderr, "argument to `l' must be between 0 and %d\n",
-                   N_LCD_IDXS );
+          fprintf( stderr, "argument to `l' must be in the range [0;%d]\n",
+                   N_LCD_IDXS - 1 );
           exit( 3 );
         }
+        handle->lcd_mode = lcd_modes[status.lcd_idx];
         break;
 
       case 'm':