[freetype2-demos] master 5f4959b 1/2: * src/ftmulti.c (main): Synchronize options with the others.

[Werner Lemberg]

branch: master
commit 5f4959bdd469dc948afa39992917e79933841c14
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/ftmulti.c (main): Synchronize options with the others.
---
 src/ftmulti.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/ftmulti.c b/src/ftmulti.c
index 91eaa2b..54bbd60 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -889,9 +889,7 @@
       "  font         The font file(s) to display.\n"
       "\n" );
     fprintf( stderr,
-      "  -w W         Set window width to W pixels (default: %dpx).\n"
-      "  -h H         Set window height to H pixels (default: %dpx).\n"
-      "\n",
+      "  -d WxH       Set window dimentions (default: %ux%u).\n",
              DIM_X, DIM_Y );
     fprintf( stderr,
       "  -e encoding  Specify encoding tag (default: no encoding).\n"
@@ -899,7 +897,7 @@
       "               `ADOB' (Adobe standard), `ADBC' (Adobe custom).\n"
       "  -r R         Use resolution R dpi (default: 72dpi).\n"
       "  -f index     Specify first glyph index to display.\n"
-      "  -d \"axis1 axis2 ...\"\n"
+      "  -a \"axis1 axis2 ...\"\n"
       "               Specify the design coordinates for each\n"
       "               variation axis at start-up.\n"
       "\n"
@@ -973,10 +971,15 @@
 
       switch ( option )
       {
-      case 'd':
+      case 'a':
         parse_design_coords( optarg );
         break;
 
+      case 'd':
+        if ( sscanf( optarg, "%ux%u", &width, &height ) != 2 )
+          usage( execname );
+        break;
+
       case 'e':
         encoding = make_tag( optarg );
         break;
@@ -985,12 +988,6 @@
         sscanf( optarg, "%i", &first_glyph );
         break;
 
-      case 'h':
-        height = atoi( optarg );
-        if ( height < 1 )
-          usage( execname );
-        break;
-
       case 'r':
         res = atoi( optarg );
         if ( res < 1 )
@@ -1012,12 +1009,6 @@
         }
         /* break; */
 
-      case 'w':
-        width = atoi( optarg );
-        if ( width < 1 )
-          usage( execname );
-        break;
-
       default:
         usage( execname );
         break;