X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage-tool.c;h=1d4f68a0e45416e37c4ee8d510319b28655fe40f;hb=c1afcf90949e5058a95e0e12a09b25a068d68b61;hp=6b9062c1eaadd14aa9b311d232635ab363dd7e0a;hpb=2e2bb3e8e00e6dbf043a9e531eacb02f61b4efc4;p=libucw.git diff --git a/images/image-tool.c b/images/image-tool.c index 6b9062c1..1d4f68a0 100644 --- a/images/image-tool.c +++ b/images/image-tool.c @@ -8,10 +8,11 @@ */ #include "lib/lib.h" -#include "lib/getopt.h" #include "lib/fastbuf.h" #include "images/images.h" #include "images/color.h" + +#include #include #include #include @@ -23,33 +24,42 @@ usage(void) fputs("\ Usage: image-tool [options] infile [outfile]\n\ \n\ --q --quiet no progress messages\n\ --f --input-format input image format (jpeg, gif, png)\n\ --F --output-format output image format\n\ --s --size force output dimensions (100x200)\n\ --b --fit-to-box scale to fit the box (100x200)\n\ --c --colorspace force output colorspace (Gray, GrayAlpha, RGB, RGBAlpha)\n\ --Q --jpeg-quality JPEG quality (1..100)\n\ --g --background background color (hexadecimal RRGGBB)\n\ -", stderr); +-q --quiet no progress messages\n\ +-f --input-format input image format (jpeg, gif, png)\n\ +-F --output-format output image format\n\ +-s --size force output dimensions (100x200)\n\ +-b --fit-to-box scale to fit the box (100x200)\n\ +-c --colorspace force output colorspace (Gray, GrayAlpha, RGB, RGBAlpha)\n\ +-Q --jpeg-quality JPEG quality (1..100)\n\ +-g --background background color (hexadecimal RRGGBB)\n\ +-G --default-background background applied only if the image contains no background info (RRGGBB, default=FFFFFF)\n\ +-a --remove-alpha remove alpha channel\n" +#ifdef CONFIG_IMAGES_EXIF +"-e --exif reads Exif data\n" +#endif +, stderr); exit(1); } -static char *shortopts = "qf:F:s:b:c:Q:g:" CF_SHORT_OPTS; +static char *shortopts = "qf:F:s:b:c:Q:g:G:ae"; static struct option longopts[] = { - CF_LONG_OPTS - { "quiet", 0, 0, 'q' }, - { "input-format", 0, 0, 'f' }, - { "output-format", 0, 0, 'F' }, - { "size", 0, 0, 's' }, - { "fit-to-box", 0, 0, 'b' }, - { "colorspace", 0, 0, 'c' }, - { "jpeg-quality", 0, 0, 'Q' }, - { "background", 0, 0, 'g' }, - { NULL, 0, 0, 0 } + { "quiet", 0, 0, 'q' }, + { "input-format", 0, 0, 'f' }, + { "output-format", 0, 0, 'F' }, + { "size", 0, 0, 's' }, + { "fit-to-box", 0, 0, 'b' }, + { "colorspace", 0, 0, 'c' }, + { "jpeg-quality", 0, 0, 'Q' }, + { "background", 0, 0, 'g' }, + { "default-background", 0, 0, 'G' }, + { "remove-alpha", 0, 0, 'a' }, +#ifdef CONFIG_IMAGES_EXIF + { "exif", 0, 0, 'e' }, +#endif + { NULL, 0, 0, 0 } }; - + static uns verbose = 1; static byte *input_file_name; static enum image_format input_format; @@ -61,6 +71,24 @@ static uns fit_to_box; static uns channels_format; static uns jpeg_quality; static struct color background_color; +static struct color default_background_color; +static uns remove_alpha; +#ifdef CONFIG_IMAGES_EXIF +static uns exif; +#endif + +static void +parse_color(struct color *color, byte *s) +{ + if (strlen(s) != 6) + usage(); + errno = 0; + char *end; + long int v = strtol(s, &end, 16); + if (errno || *end || v < 0) + usage(); + color_make_rgb(color, (v >> 16) & 255, (v >> 8) & 255, v & 255); +} #define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0) @@ -69,7 +97,8 @@ main(int argc, char **argv) { log_init(argv[0]); int opt; - while ((opt = cf_getopt(argc, argv, shortopts, longopts, NULL)) >= 0) + default_background_color = color_white; + while ((opt = getopt_long(argc, argv, shortopts, longopts, NULL)) >= 0) switch (opt) { case 'q': @@ -114,17 +143,19 @@ main(int argc, char **argv) usage(); break; case 'g': - { - if (strlen(optarg) != 6) - usage(); - errno = 0; - char *end; - long int v = strtol(optarg, &end, 16); - if (errno || *end || v < 0) - usage(); - color_make_rgb(&background_color, (v >> 16) & 255, (v >> 8) & 255, v & 255); - } + parse_color(&background_color, optarg); + break; + case 'G': + parse_color(&default_background_color, optarg); break; + case 'a': + remove_alpha++; + break; +#ifdef CONFIG_IMAGES_EXIF + case 'e': + exif++; + break; +#endif default: usage(); } @@ -134,17 +165,22 @@ main(int argc, char **argv) input_file_name = argv[optind++]; if (argc > optind) output_file_name = argv[optind]; - + #define TRY(x) do{ if (!(x)) die("Error: %s", it.err_msg); }while(0) MSG("Initializing image library"); struct image_thread it; struct image_io io; image_thread_init(&it); - image_io_init(&it, &io); + if (!image_io_init(&it, &io)) + die("Cannot initialize image I/O (%s)", it.err_msg); MSG("Reading %s", input_file_name); io.fastbuf = bopen(input_file_name, O_RDONLY, 1 << 18); io.format = input_format ? : image_file_name_to_format(input_file_name); +#ifdef CONFIG_IMAGES_EXIF + if (exif) + io.flags |= IMAGE_IO_WANT_EXIF; +#endif TRY(image_io_read_header(&io)); if (!output_file_name) { @@ -153,6 +189,16 @@ main(int argc, char **argv) printf("Dimensions: %dx%d\n", io.cols, io.rows); printf("Colorspace: %s\n", (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags & IMAGE_CHANNELS_FORMAT)); printf("NumColors: %d\n", io.number_of_colors); + if (io.background_color.color_space) + { + byte rgb[3]; + color_put_rgb(rgb, &io.background_color); + printf("Background: %02x%02x%02x\n", rgb[0], rgb[1], rgb[2]); + } +#ifdef CONFIG_IMAGES_EXIF + if (io.exif_size) + printf("ExifSize: %u\n", io.exif_size); +#endif } else { @@ -170,6 +216,10 @@ main(int argc, char **argv) } if (background_color.color_space) io.background_color = background_color; + else if (!io.background_color.color_space) + io.background_color = default_background_color; + if (remove_alpha) + io.flags &= ~IMAGE_ALPHA; if (channels_format) io.flags = io.flags & ~IMAGE_PIXEL_FORMAT | channels_format; if (!(io.flags & IMAGE_ALPHA)) @@ -186,7 +236,7 @@ main(int argc, char **argv) TRY(image_io_write(&io)); bclose(io.fastbuf); } - + image_io_cleanup(&io); image_thread_cleanup(&it); MSG("Done.");