Changeset 1906Tweet

Timestamp:

Nov 6, 2007, 2:45:18 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added --dither option and updated usage()

File:

• libcaca/trunk/src/img2txt.c (modified) (6 diffs)

libcaca/trunk/src/img2txt.c

@@ -46 +46 @@
     fprintf(stderr, "  -h, --help\tThis help\n");
     fprintf(stderr, "  -W, --width=WIDTH\tWidth of resulting image\n");
-    fprintf(stderr, "  -H, --HEIGHT=HEIGHT\tHeight of resulting image\n");
+    fprintf(stderr, "  -H, --height=HEIGHT\tHeight of resulting image\n");
+    fprintf(stderr, "  -d, --dither=DITHER\tDithering algorithm to use :\n");
+    fprintf(stderr, "\t\t\tnone : Nearest color\n");
+    fprintf(stderr, "\t\t\tordered2 : Ordered 2x2\n");
+    fprintf(stderr, "\t\t\tordered4 : Ordered 4x4\n");
+    fprintf(stderr, "\t\t\tordered8 : Ordered 8x8\n");
+    fprintf(stderr, "\t\t\trandom   : Random\n");
+    fprintf(stderr, "\t\t\tfstein   : Floyd Steinberg (default)\n");
     fprintf(stderr, "  -f, --format=FORMAT\tFormat of the resulting image :\n");
-    fprintf(stderr, "\t\t\tansi : coulored ANSI\n");
+    fprintf(stderr, "\t\t\tansi : coulored ANSI (default)\n");
     fprintf(stderr, "\t\t\tcaca : internal libcaca format\n");
     fprintf(stderr, "\t\t\tutf8 : UTF8 with CR\n");
@@ -69 +76 @@
     unsigned int cols = 0, lines = 0;
     char *format = NULL;
+    char *dither = NULL;
 
 
@@ -86 +94 @@
             { "height", 1, NULL, 'H' },
             { "format", 1, NULL, 'f' },
+            { "dither", 1, NULL, 'd' },
             { "help",   0, NULL, 'h' },
         };
-        int c = mygetopt(argc, argv, "W:H:f:h", long_options, &option_index);
+        int c = mygetopt(argc, argv, "W:H:f:d:h", long_options, &option_index);
         if(c == -1)
             break;
@@ -103 +112 @@
             format = myoptarg;
             break;
+        case 'd': /* --dither */
+            dither = myoptarg;
+            break;
         case 'h': /* --help */
             usage(argc, argv);
@@ -112 +124 @@
         }
     }
-
 
 
@@ -149 +160 @@
     cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
     cucul_clear_canvas(cv);
+    cucul_set_dither_algorithm(i->dither, dither?dither:"fstein");
     cucul_dither_bitmap(cv, 0, 0, cols, lines, i->dither, i->pixels);