X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage-tool.c;h=b211f1969852a999ef52777a8c22a9db8ef2b1a9;hb=c4bf633211b0424492b5a3937d6a6d2e0d79a4cf;hp=eb2a3ec2568e9f0e80ab37517856c8987cd3699f;hpb=aead0f5b430c5589abdc6d2170a9bc827e008915;p=libucw.git diff --git a/images/image-tool.c b/images/image-tool.c index eb2a3ec2..b211f196 100644 --- a/images/image-tool.c +++ b/images/image-tool.c @@ -1,5 +1,5 @@ /* - * Simple image manupulation utility + * Image Library -- Simple image manipulation utility * * (c) 2006 Pavel Charvat * @@ -29,16 +29,17 @@ Usage: image-tool [options] infile [outfile]\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\ +-c --colorspace force output colorspace (Grayscale, Grayscale+Alpha, RGB, RGB+Alpha, ...)\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\ -", stderr); +-e --exif reads Exif data\n" +, stderr); exit(1); } -static char *shortopts = "qf:F:s:b:c:Q:g:G:a"; +static char *shortopts = "qf:F:s:b:c:Q:g:G:ae"; static struct option longopts[] = { { "quiet", 0, 0, 'q' }, @@ -51,9 +52,10 @@ static struct option longopts[] = { "background", 0, 0, 'g' }, { "default-background", 0, 0, 'G' }, { "remove-alpha", 0, 0, 'a' }, + { "exif", 0, 0, 'e' }, { NULL, 0, 0, 0 } }; - + static uns verbose = 1; static byte *input_file_name; static enum image_format input_format; @@ -67,6 +69,7 @@ static uns jpeg_quality; static struct color background_color; static struct color default_background_color; static uns remove_alpha; +static uns exif; static void parse_color(struct color *color, byte *s) @@ -81,7 +84,7 @@ parse_color(struct color *color, byte *s) color_make_rgb(color, (v >> 16) & 255, (v >> 8) & 255, v & 255); } -#define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0) +#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0) int main(int argc, char **argv) @@ -142,6 +145,9 @@ main(int argc, char **argv) case 'a': remove_alpha++; break; + case 'e': + exif++; + break; default: usage(); } @@ -151,37 +157,43 @@ 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) + +#define TRY(x) do{ if (!(x)) exit(1); }while(0) MSG("Initializing image library"); - struct image_thread it; + struct image_context ctx; struct image_io io; - image_thread_init(&it); - if (!image_io_init(&it, &io)) - die("Cannot initialize image I/O (%s)", it.err_msg); + image_context_init(&ctx); + ctx.tracing_level = ~0U; + if (!image_io_init(&ctx, &io)) + die("Cannot initialize image I/O"); MSG("Reading %s", input_file_name); + byte cs_buf[IMAGE_CHANNELS_FORMAT_MAX_SIZE]; io.fastbuf = bopen(input_file_name, O_RDONLY, 1 << 18); io.format = input_format ? : image_file_name_to_format(input_file_name); + if (exif) + io.flags |= IMAGE_IO_WANT_EXIF; TRY(image_io_read_header(&io)); if (!output_file_name) { bclose(io.fastbuf); printf("Format: %s\n", image_format_to_extension(io.format) ? : (byte *)"?"); 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); + printf("Colorspace: %s\n", (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags, cs_buf)); + printf("NumColors: %u\n", io.number_of_colors); if (io.background_color.color_space) { byte rgb[3]; - color_put_rgb(rgb, &io.background_color); + TRY(color_put(&ctx, &io.background_color, rgb, COLOR_SPACE_RGB)); printf("Background: %02x%02x%02x\n", rgb[0], rgb[1], rgb[2]); } + if (io.exif_size) + printf("ExifSize: %u\n", io.exif_size); } else { MSG("%s %dx%d %s", image_format_to_extension(io.format) ? : (byte *)"?", io.cols, io.rows, - (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags & IMAGE_CHANNELS_FORMAT)); + (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags, cs_buf)); if (cols) if (fit_to_box) { @@ -204,19 +216,28 @@ main(int argc, char **argv) io.flags |= IMAGE_IO_USE_BACKGROUND; if (jpeg_quality) io.jpeg_quality = jpeg_quality; + uns output_fmt = output_format ? : image_file_name_to_format(output_file_name); + uns output_cs = io.flags & IMAGE_COLOR_SPACE; + if (output_fmt != IMAGE_FORMAT_JPEG && + output_cs != COLOR_SPACE_GRAYSCALE && + output_cs != COLOR_SPACE_RGB) + { + MSG("Forcing RGB color space"); + io.flags = (io.flags & ~IMAGE_COLOR_SPACE) | COLOR_SPACE_RGB; + } TRY(image_io_read_data(&io, 0)); bclose(io.fastbuf); MSG("Writing %s", output_file_name); io.fastbuf = bopen(output_file_name, O_WRONLY | O_CREAT | O_TRUNC, 1 << 18); io.format = output_format ? : image_file_name_to_format(output_file_name); MSG("%s %dx%d %s", image_format_to_extension(io.format) ? : (byte *)"?", io.cols, io.rows, - image_channels_format_to_name(io.flags & IMAGE_CHANNELS_FORMAT)); + image_channels_format_to_name(io.flags, cs_buf)); TRY(image_io_write(&io)); bclose(io.fastbuf); } - + image_io_cleanup(&io); - image_thread_cleanup(&it); + image_context_cleanup(&ctx); MSG("Done."); return 0; }