Correctly interpret a single number given to -c

diff --git a/Readme b/Readme
index 36728d7d2fcc2c25097da4c4ac9958feaa3d1e72..111f53cadd2f63d418386aeedf350d4e8d3f7f89 100644 (file)
--- a/Readme
+++ b/Readme
@@ -22,10 +22,11 @@ Command-line options
     Number of characters to put in one line.  Defaults to autodetect.  Ignored
     if -p is used.
 
-  -c <pixels>
-    Character cell size.  The special values auto and autorect may be used to
-    choose an autodetected square or rectangle cell, respectively.  Defaults to
-    autodetected square.  Ignored if -p is used.
+  -c <pixels>[x<pixels>]
+    Character cell size.  If only a single number is given, a square cell is
+    used.  The special values auto and autorect may be used to choose an
+    autodetected square or rectangle cell, respectively.  The default is auto.
+    Ignored if -p is used.
 
   -o <filename>
     Output file name.  Use - for stdout; the output is a png image, so it's

diff --git a/ttf2png.c b/ttf2png.c
index ebc0ccce76f43fee0e93b3c43d756bc129a900bc..1b1106a9f03bff035d4b9e2dc53e260840ce668f 100644 (file)
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -159,6 +159,8 @@ int main(int argc, char **argv)
                                cellw = strtol(optarg, &ptr, 0);
                                if(ptr[0]=='x' && isdigit(ptr[1]))
                                        cellh = strtol(ptr+1, NULL, 0);
+                               else
+                                       cellh = cellw;
                        }
                        break;
                case 'o':