X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/5749c5e97a8b984720cef75f328944270874d713..f58512db610bb5ce272a142a552b8bf75b8c2f6e:/src/lbximg.c diff --git a/src/lbximg.c b/src/lbximg.c index 581a33a..0fd3693 100644 --- a/src/lbximg.c +++ b/src/lbximg.c @@ -1,6 +1,6 @@ /* * 2ooM: The Master of Orion II Reverse Engineering Project - * Simple command-line tool to convert an LBX image to a set of PNGs. + * Simple command-line tool to convert an LBX image to other formats. * Copyright © 2006-2011, 2013 Nick Bowler * * This program is free software: you can redistribute it and/or modify @@ -19,29 +19,34 @@ #include #include #include +#include #include #include #include #include #include -#include - #include "tools.h" #include "image.h" #include "error.h" #include "lbx.h" +#include "imgoutput.h" + /* Global flags */ static int verbose = 0; static char *outname = "out"; static int usepalette = 1; +enum { + OPT_PREFIX = UCHAR_MAX+1, +}; + static void printusage(void) { puts("usage: lbximg [-i|-d] [-v] [-p palette_file] [-O override_file]" " [-f path]"); - puts(" [frameno ...]"); + puts(" [-F format] [frameno ...]"); } static void printhelp(void) @@ -56,6 +61,54 @@ enum { MODE_IDENT, }; +static const struct img_format { + img_output_func *output; + char name[4]; + bool enabled; +} formats[] = { +#if HAVE_LIBPNG + { img_output_png, "png", 1 }, +#endif + { img_output_pam, "pam", 1 }, + { img_output_ppm, "ppm", 1 }, + { img_output_pbm, "pbm", 1 }, +}; + +static int lookup_format(const char *fmt) +{ + for (size_t i = 0; i < sizeof formats / sizeof formats[0]; i++) { + assert(!formats[i].name[sizeof formats[i].name - 1]); + + if (!fmt && formats[i].enabled) + return i; + + if (strcmp(formats[i].name, fmt)) + continue; + + if (!formats[i].enabled) { + tool_err(-1, "%s support disabled at build time", fmt); + return -1; + } + + return i; + } + + tool_err(-1, "unknown format %s", fmt); + return -1; +} + +bool img_is_masked(unsigned char **mask, unsigned width, unsigned height) +{ + unsigned x, y; + + for (x = y = 0; y < height; ++x < width || (x = 0, y++)) { + if (mask[y][x] == 0) + return true; + } + + return false; +} + int parserange(unsigned frames, char *str, unsigned char *bits) { unsigned long start, end; @@ -64,12 +117,12 @@ int parserange(unsigned frames, char *str, unsigned char *bits) start = strtoul(str, &endptr, 0); if (start >= frames) { - errmsg("frame %lu out of range.\n", start); + tool_err(-1, "frame %lu out of range.", start); return -1; } if (endptr == str) { - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } @@ -80,7 +133,7 @@ int parserange(unsigned frames, char *str, unsigned char *bits) case '-': end = strtoul(endptr+1, &endptr, 0); if (end >= frames) { - errmsg("frame %lu out of range.\n", end); + tool_err(-1, "frame %lu out of range.", end); return -1; } @@ -88,12 +141,12 @@ int parserange(unsigned frames, char *str, unsigned char *bits) end = frames - 1; break; default: - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } if (end < start) { - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } @@ -104,128 +157,40 @@ int parserange(unsigned frames, char *str, unsigned char *bits) return 0; } -static int ismasked(unsigned char **mask, unsigned width, unsigned height) -{ - unsigned y, x; - for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { - if (mask[y][x] == 0) return 1; - } - } - - return 0; -} - -int outpng(unsigned int frameno, +int output(unsigned int frameno, const struct img_format *fmt, unsigned char **framedata, unsigned char **mask, unsigned int width, unsigned int height, struct lbx_colour palette[static 256]) { char name[strlen(outname) + sizeof ".65535.png"]; - unsigned char *row; - unsigned int x, y; FILE *of; + int rc; - png_structp png; - png_infop info; - + assert(fmt->output != NULL); assert(frameno < 65536); - snprintf(name, sizeof name, "%s.%03d.png", outname, frameno); - - row = malloc(4 * width); - if (!row) { - errmsg("failed to allocate row buffer: %s\n", strerror(errno)); - return -1; - } + snprintf(name, sizeof name, "%s.%03d.%s", outname, frameno, fmt->name); of = fopen(name, "wb"); if (!of) { - errmsg("failed to open %s: %s.\n", name, strerror(errno)); - free(row); + tool_err(0, "failed to open %s", name); return -1; } - png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png) { - errmsg("failed to init libpng.\n", 0); - goto err; - } - - info = png_create_info_struct(png); - if (!info) { - errmsg("failed to init libpng.\n", 0); - png_destroy_write_struct(&png, NULL); - goto err; + rc = fmt->output(of, name, width, height, framedata, mask, palette); + if (rc < 0) { + fclose(of); + return -1; } - if (setjmp(png_jmpbuf(png))) { - png_destroy_write_struct(&png, &info); - goto err; + if (fclose(of) == EOF) { + tool_err(0, "error writing %s", name); + return -1; } - - png_init_io(png, of); - - if (!ismasked(mask, width, height)) { - /* - * This case is easy; we can just feed the palette and pixel - * data to libpng and let it do its magic. - */ - - png_color png_palette[256]; - for (unsigned i = 0; i < 256; i++) { - png_palette[i].red = palette[i].red; - png_palette[i].green = palette[i].green; - png_palette[i].blue = palette[i].blue; - } - - png_set_IHDR(png, info, width, height, 8, - PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, - PNG_FILTER_TYPE_DEFAULT); - png_set_PLTE(png, info, png_palette, 256); - png_set_rows(png, info, framedata); - png_write_png(png, info, PNG_TRANSFORM_IDENTITY, NULL); - } else { - /* - * Unfortunately, LBX doesn't translate nicely to PNG here. - * LBX has a 256 colour palette _plus_ transparency. - * We'll form an RGBA PNG to deal with this. - */ - - png_set_IHDR(png, info, width, height, 8, - PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, - PNG_FILTER_TYPE_DEFAULT); - - png_write_info(png, info); - - for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { - row[4*x+0] = palette[framedata[y][x]].red; - row[4*x+1] = palette[framedata[y][x]].green; - row[4*x+2] = palette[framedata[y][x]].blue; - row[4*x+3] = (mask[y][x]) ? -1 : 0; - } - - png_write_row(png, row); - } - - png_write_end(png, NULL); - } - - png_destroy_write_struct(&png, &info); - fclose(of); - free(row); - if (verbose) printf("wrote %s\n", name); + return 0; -err: - fclose(of); - remove(name); - free(row); - return -1; } static int loadoverride(FILE *f, struct lbx_colour palette[static 256]) @@ -234,19 +199,19 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256]) struct lbx_imginfo info; if (!overimg) { - errmsg("failed to open override image: %s\n", lbx_errmsg()); + tool_err(-1, "failed to open override image: %s", lbx_errmsg()); return -1; } lbx_img_getinfo(overimg, &info); if (!info.palettesz) { - errmsg("override image has no palette.\n", 0); + tool_err(-1, "override image has no palette."); lbx_img_close(overimg); return -1; } if (lbx_img_getpalette(overimg, palette) == -1) { - errmsg("error reading override palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading override palette: %s", lbx_errmsg()); lbx_img_close(overimg); return -1; } @@ -261,35 +226,26 @@ static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info, { int i; - /* In no-palette mode, use palette indices for colour. */ - if (!usepalette) { - for (i = 0; i < 256; i++) { - palette[i] = (struct lbx_colour){i,i,i}; - } - - return 0; - } - /* For sanity. */ if (!palf && !info->palettesz && !override) { - errmsg("no palette available.\n", 0); + tool_err(-1, "no palette available."); return -1; } /* Default the palette to a wonderful pink. */ for (i = 0; i < 256; i++) { - palette[i] = (struct lbx_colour){0xff, 0x00, 0xff}; + palette[i] = (struct lbx_colour){0x3f, 0x00, 0x3f}; } /* Read the external palette, if any. */ if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) { - errmsg("error reading external palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading external palette: %s", lbx_errmsg()); return -1; } /* Read the embedded palette, if any. */ if (info->palettesz && lbx_img_getpalette(img, palette) == -1) { - errmsg("error reading embedded palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading embedded palette: %s", lbx_errmsg()); return -1; } @@ -301,14 +257,18 @@ static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info, return 0; } -int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv) +static int +decode(struct lbx_image *img, FILE *palf, FILE *override, int fmt, char **argv) { unsigned char *framebits; struct lbx_colour palette[256]; struct lbx_imginfo info; + int ret = EXIT_SUCCESS; int extracted = 0; unsigned int i; + assert(fmt >= 0 && fmt < sizeof formats / sizeof formats[0]); + lbx_img_getinfo(img, &info); framebits = calloc(1, img->frames / CHAR_BIT + 1); @@ -326,8 +286,11 @@ int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv) } } - if (loadpalette(img, &info, palf, override, palette) == -1) { - goto err; + if (usepalette) { + if (loadpalette(img, &info, palf, override, palette) == -1) { + ret = EXIT_FAILURE; + goto err; + } } /* Extract the images, in order. */ @@ -340,51 +303,53 @@ int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv) data = lbx_img_getframe(img, i); if (!data) { - errmsg("error in frame %u: %s\n", i, lbx_errmsg()); + tool_err(-1, "error in frame %u: %s", i, lbx_errmsg()); + ret = EXIT_FAILURE; continue; } mask = lbx_img_getmask(img); - if (!outpng(i, data, mask, img->width, img->height, palette)) { + if (!output(i, &formats[fmt], data, mask, + img->width, img->height, + usepalette ? palette : NULL)) { extracted = 1; } } if (!extracted) { - errmsg("no frames extracted.\n", 0); - goto err; + tool_err(-1, "no frames extracted."); + ret = EXIT_FAILURE; } - - free(framebits); - return EXIT_SUCCESS; err: free(framebits); - return EXIT_FAILURE; + return ret; } int main(int argc, char **argv) { - int mode = MODE_NONE, opt, rc = EXIT_FAILURE; + int mode = MODE_NONE, fmt, opt, rc = EXIT_FAILURE; struct lbx_pipe_state stdin_handle = { .f = stdin }; + const char *file = NULL, *fmtstring = NULL; FILE *palf = NULL, *overf = NULL; - const char *file = NULL; struct lbx_image *img; - static const char *sopts = "idnvf:p:O:V"; + static const char sopts[] = "idnvF:f:p:O:VH"; static const struct option lopts[] = { - { "ident", 0, NULL, 'i' }, - { "decode", 0, NULL, 'd' }, - { "verbose", 0, NULL, 'v' }, - { "file", 1, NULL, 'f' }, - { "palette", 1, NULL, 'p' }, - { "override", 1, NULL, 'p' }, + { "identify", 0, NULL, 'i' }, + { "decode", 0, NULL, 'd' }, + { "verbose", 0, NULL, 'v' }, + { "file", 1, NULL, 'f' }, + { "format", 1, NULL, 'F' }, + { "palette", 1, NULL, 'p' }, + { "override", 1, NULL, 'O' }, + { "no-palette", 0, NULL, 'n' }, - { "version", 0, NULL, 'V' }, - { "usage", 0, NULL, 'U' }, - { "help", 0, NULL, 'H' }, + { "output-prefix", 1, NULL, OPT_PREFIX }, - { "no-palette", 0, NULL, 'n' }, + { "version", 0, NULL, 'V' }, + { "usage", 0, NULL, 'U' }, + { "help", 0, NULL, 'H' }, { 0 } }; @@ -401,6 +366,9 @@ int main(int argc, char **argv) case 'v': verbose = 1; break; + case 'F': + fmtstring = optarg; + break; case 'f': file = optarg; break; @@ -410,7 +378,7 @@ int main(int argc, char **argv) case 'p': palf = fopen(optarg, "rb"); if (!palf) { - errmsg("failed to open %s: %m\n", optarg); + tool_err(0, "failed to open %s", optarg); return EXIT_FAILURE; } @@ -418,10 +386,13 @@ int main(int argc, char **argv) case 'O': overf = fopen(optarg, "rb"); if (!overf) { - errmsg("failed to open %s: %m\n", optarg); + tool_err(0, "failed to open %s", optarg); return EXIT_FAILURE; } break; + case OPT_PREFIX: + outname = optarg; + break; case 'V': tool_version(); return EXIT_SUCCESS; @@ -431,24 +402,27 @@ int main(int argc, char **argv) case 'H': printhelp(); return EXIT_SUCCESS; - case '?': - case ':': + default: return EXIT_FAILURE; } } if (mode == MODE_NONE) { - errmsg("you must specify a mode.\n", 0); + tool_err(-1, "you must specify a mode."); return EXIT_FAILURE; } + fmt = lookup_format(fmtstring); + if (fmt < 0) + return EXIT_FAILURE; + if (file) img = lbx_img_fopen(file); else img = lbx_img_open(&stdin_handle, &lbx_pipe_fops, NULL); if (!img) { - errmsg("failed to open image: %s.\n", lbx_errmsg()); + tool_err(-1, "failed to open image: %s.", lbx_errmsg()); return EXIT_FAILURE; } @@ -459,7 +433,7 @@ int main(int argc, char **argv) file = "stdin"; lbx_img_getinfo(img, &info); - printf("%s is %ux%u LBX image, %u frame(s)%s%s\n", + printf("%s is %hux%hu LBX image, %hhu frame(s)%s%s%s\n", file, img->width, img->height, img->frames, info.palettesz ? ", embedded palette" : "", img->chunk ? ", chunked" : "", @@ -467,8 +441,11 @@ int main(int argc, char **argv) } switch (mode) { + case MODE_IDENT: + rc = 0; + break; case MODE_DECODE: - rc = decode(img, palf, overf, &argv[optind]); + rc = decode(img, palf, overf, fmt, &argv[optind]); break; }