Changeset 1919Tweet

Timestamp:

Nov 7, 2007, 11:29:02 AM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added switch to control output font size, and updated documentation

accordingly

Location:

libcaca/trunk

Files:

• doc/img2txt.1 (modified) (2 diffs)
• src/img2txt.c (modified) (6 diffs)

libcaca/trunk/doc/img2txt.1

@@ -11 +11 @@
 .B \-H
 .I height
+]
+[
+.B \-x
+.I font-width
+]
+[
+.B \-y
+.I font-height
 ]
 .PD 0
@@ -60 +68 @@
 .B \-H, \-\-height=<height>
 Change output line count. If not given, the height is computed to match correct aspect ratio.
+.TP
+.B \-x, \-\-font-width=<width>
+Change output font width. If not given, the default is set to 6. This value will be used for computing aspect ratio.
+.TP
+.B \-y, \-\-font-height=<height>
+Change output font height. If not given, the default is set to 10. This value will be used for computing aspect ratio.
 .TP
 .B \-b, \-\-brightness=<brightness>

libcaca/trunk/src/img2txt.c

@@ -50 +50 @@
     fprintf(stderr, "  -W, --width=WIDTH\t\tWidth of resulting image\n");
     fprintf(stderr, "  -H, --height=HEIGHT\t\tHeight of resulting image\n");
+    fprintf(stderr, "  -x, --font-width=WIDTH\t\tWidth of output font\n");
+    fprintf(stderr, "  -y, --font-height=HEIGHT\t\tHeight of output font\n");
     fprintf(stderr, "  -b, --brightness=BRIGHTNESS\tBrightness of resulting image\n");
     fprintf(stderr, "  -c, --contrast=CONTRAST\tContrast of resulting image\n");
@@ -97 +99 @@
     unsigned long int len;
     struct image *i;
-    unsigned int cols = 0, lines = 0;
+    unsigned int cols = 0, lines = 0, font_width = 6, font_height = 10;
     char *format = NULL;
     char *dither = NULL;
@@ -116 +118 @@
             { "width",       1, NULL, 'W' },
             { "height",      1, NULL, 'H' },
+            { "font-width",  1, NULL, 'x' },
+            { "font-height", 1, NULL, 'y' },
             { "format",      1, NULL, 'f' },
             { "dither",      1, NULL, 'd' },
@@ -122 +126 @@
             { "contrast",    1, NULL, 'c' },
             { "help",        0, NULL, 'h' },
-            { "version",        0, NULL, 'v' },
+            { "version",     0, NULL, 'v' },
         };
-        int c = mygetopt(argc, argv, "W:H:f:d:g:b:c:h:v", long_options, &option_index);
+        int c = mygetopt(argc, argv, "W:H:f:d:g:b:c:h:v:x:y:", long_options, &option_index);
         if(c == -1)
             break;
@@ -136 +140 @@
             lines = atoi(myoptarg);
             break;
+        case 'x': /* --width */
+            font_width = atoi(myoptarg);
+            break;
+        case 'y': /* --height */
+            font_height = atoi(myoptarg);
+            break;
         case 'f': /* --format */
             format = myoptarg;
@@ -185 +195 @@
     {
         cols = 60;
-        lines = cols * i->h * 6 / i->w / 10;
+        lines = cols * i->h * font_width / i->w / font_height;
     }
     else if(cols && !lines)
     {
-        lines = cols * i->h * 6 / i->w / 10;
+        lines = cols * i->h * font_width / i->w / font_height;
     }
     else if(!cols && lines)
     {
-        cols = lines * i->w * 10 / i->h / 6;
+        cols = lines * i->w * font_height / i->h / font_width;
     }