X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/b54180ad4297cf2d3fd943bf78976f8d34d5eea9..efc068f39f6811cdc0e004d2acf4ef08b2b71c3e:/src/lbximg.c diff --git a/src/lbximg.c b/src/lbximg.c index b2c97f2..5beaaae 100644 --- a/src/lbximg.c +++ b/src/lbximg.c @@ -1,7 +1,7 @@ /* * 2ooM: The Master of Orion II Reverse Engineering Project * Simple command-line tool to convert an LBX image to other formats. - * Copyright © 2006-2011, 2013 Nick Bowler + * Copyright © 2006-2011, 2013-2014, 2021 Nick Bowler * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,13 @@ #include #include #include +#include #include #include #include +#include "help.h" + #include "tools.h" #include "image.h" #include "error.h" @@ -33,22 +36,49 @@ #include "imgoutput.h" +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + /* Global flags */ static int verbose = 0; static char *outname = "out"; static int usepalette = 1; -static void printusage(void) +#include "imgopts.h" +static const char sopts[] = SOPT_STRING; +static const struct option lopts[] = { LOPTS_INITIALIZER, {0} }; + +static void print_usage(FILE *f) { - puts("usage: lbximg [-i|-d] [-v] [-p palette_file] [-O override_file]" - " [-f path]"); - puts(" [-F format] [frameno ...]"); + const char *progname = tool_invocation(); + + fprintf(f, "Usage: %s [options] [-i|-d] [frame ...]\n", progname); + if (f != stdout) + fprintf(f, "Try %s --help for more information.\n", progname); } -static void printhelp(void) +static void print_help(void) { - printusage(); - puts("For now, see the man page for detailed help."); + const struct option *opt; + + print_usage(stdout); + + putchar('\n'); + puts("Options:"); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + int w; + + if (!lopt_get_help(opt, &help)) + continue; + + help_print_option(opt, help.arg, help.desc, 20); + } + putchar('\n'); + + puts("For more information, see the lbximg(1) man page."); + putchar('\n'); + + printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT); } enum { @@ -93,13 +123,21 @@ static int lookup_format(const char *fmt) return -1; } -bool img_is_masked(unsigned char **mask, unsigned width, unsigned height) +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; + unsigned long npixels = (unsigned long) width * height; + unsigned long mask_sz = npixels / CHAR_BIT + (npixels % CHAR_BIT != 0); + + for (unsigned long i = 0; i < mask_sz; i++) { + if (i+1 < mask_sz) { + if (mask[i] != (unsigned char)-1) + return true; + } else { + unsigned char test = (1u << npixels % CHAR_BIT) - 1; + + if ((mask[i] & test) != test) + return true; + } } return false; @@ -154,7 +192,7 @@ int parserange(unsigned frames, char *str, unsigned char *bits) } int output(unsigned int frameno, const struct img_format *fmt, - unsigned char **framedata, unsigned char **mask, + unsigned char *pixels, unsigned char *pixel_mask, unsigned int width, unsigned int height, struct lbx_colour palette[static 256]) { @@ -172,7 +210,7 @@ int output(unsigned int frameno, const struct img_format *fmt, return -1; } - rc = fmt->output(of, name, width, height, framedata, mask, palette); + rc = fmt->output(of, name, width, height, pixels, pixel_mask, palette); if (rc < 0) { fclose(of); return -1; @@ -182,7 +220,7 @@ int output(unsigned int frameno, const struct img_format *fmt, tool_err(0, "error writing %s", name); return -1; } - + if (verbose) printf("wrote %s\n", name); @@ -191,84 +229,180 @@ int output(unsigned int frameno, const struct img_format *fmt, static int loadoverride(FILE *f, struct lbx_colour palette[static 256]) { - struct lbx_image *overimg = lbx_img_open(f, &lbx_default_fops, NULL); - struct lbx_imginfo info; + struct lbx_image *img; + int rc, ret = 0; - if (!overimg) { + img = lbx_img_open(f, &lbx_default_fops, NULL); + if (!img) { tool_err(-1, "failed to open override image: %s", lbx_errmsg()); return -1; } - lbx_img_getinfo(overimg, &info); - if (!info.palettesz) { - tool_err(-1, "override image has no palette."); - lbx_img_close(overimg); - return -1; - } - - if (lbx_img_getpalette(overimg, palette) == -1) { + rc = lbx_img_getpalette(img, palette); + if (rc < 0) { tool_err(-1, "error reading override palette: %s", lbx_errmsg()); - lbx_img_close(overimg); - return -1; + ret = -1; + } else if (rc == 0) { + tool_err(-1, "override image has no palette."); + ret = -1; } - lbx_img_close(overimg); - return 0; + lbx_img_close(img); + return ret; } -static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info, - FILE *palf, FILE *override, - struct lbx_colour palette[static 256]) +static int loadpalette(struct lbx_image *img, FILE *palf, FILE *override, + struct lbx_colour *palette) { - int i; - - /* For sanity. */ - if (!palf && !info->palettesz && !override) { - tool_err(-1, "no palette available."); - return -1; - } + int rc, ret = -1; /* Default the palette to a wonderful pink. */ - for (i = 0; i < 256; i++) { + for (unsigned i = 0; i < 256; i++) { 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) { - tool_err(-1, "error reading external palette: %s", lbx_errmsg()); - return -1; + if (palf) { + rc = lbx_img_loadpalette(palf, &lbx_default_fops, palette); + if (rc < 0) { + tool_err(-1, "error reading external palette: %s", lbx_errmsg()); + return -1; + } + + ret = 0; } - /* Read the embedded palette, if any. */ - if (info->palettesz && lbx_img_getpalette(img, palette) == -1) { + /* Read the embedded palette */ + rc = lbx_img_getpalette(img, palette); + if (rc < 0) { tool_err(-1, "error reading embedded palette: %s", lbx_errmsg()); return -1; + } else if (rc > 0) { + ret = 0; } /* Read the override palette, if any. */ - if (override && loadoverride(override, palette) == -1) { + if (override) { + rc = loadoverride(override, palette); + if (rc < 0) + return -1; + ret = 0; + } + + /* If we literally have no palette data at all, may as well fail. */ + if (ret < 0) + tool_err(-1, "no palette available."); + return ret; +} + +/* Return true iff a divides b. */ +static bool divides(unsigned a, unsigned b) +{ + if (b == 0) + return true; + if (a == 0) + return false; + + return b % a == 0; +} + +/* Set n bits starting from offset in the bitmap. */ +static void +set_bits(unsigned char *bitmap, unsigned long offset, unsigned long n) +{ + if (offset % CHAR_BIT) { + bitmap[offset/CHAR_BIT] |= (n >= CHAR_BIT ? -1u : (1u << n) - 1) + << offset%CHAR_BIT; + + n -= MIN(n, CHAR_BIT - offset%CHAR_BIT); + offset += CHAR_BIT - offset%CHAR_BIT; + } + + if (n > CHAR_BIT) { + memset(&bitmap[offset/CHAR_BIT], -1, n/CHAR_BIT); + + offset += n - n%CHAR_BIT; + n %= CHAR_BIT; + } + + if (n) { + bitmap[offset/CHAR_BIT] |= (1u << n) - 1; + } +} + +static int decode_frame(struct lbx_image *img, unsigned n, + unsigned char *pixels, unsigned char *pixel_mask) +{ + unsigned x, y; + long rc; + + rc = lbx_img_seek(img, n); + if (rc < 0) { + tool_err(-1, "frame %u: invalid frame: %s\n", n, lbx_errmsg()); return -1; } + while ((rc = lbx_img_read_row_header(img, &x, &y)) != 0) { + unsigned long offset; + + if (rc < 0) { + tool_err(-1, "frame %u: invalid row: %s", n, lbx_errmsg()); + return -1; + } + + offset = (unsigned long) y * img->width + x; + rc = lbx_img_read_row_data(img, pixels+offset); + if (rc < 0) { + tool_err(-1, "frame %u: error reading row: %s\n", n, lbx_errmsg()); + return -1; + } + + set_bits(pixel_mask, offset, rc); + } + return 0; } static int decode(struct lbx_image *img, FILE *palf, FILE *override, int fmt, char **argv) { - unsigned char *framebits; + unsigned char *pixels = NULL, *pixel_mask = NULL, *framebits = NULL; struct lbx_colour palette[256]; - struct lbx_imginfo info; + int rc, ret = EXIT_FAILURE; int extracted = 0; unsigned int i; + size_t npixels, mask_sz; assert(fmt >= 0 && fmt < sizeof formats / sizeof formats[0]); - lbx_img_getinfo(img, &info); + npixels = img->width; + if (img->height && npixels >= SIZE_MAX / img->height) { + tool_err(-1, "image too large"); + goto err; + } + npixels *= img->height; + + /* Ensure there is at least 1 byte to allocate */ + if (npixels == 0) + npixels = 1; framebits = calloc(1, img->frames / CHAR_BIT + 1); if (!framebits) { - return EXIT_FAILURE; + tool_err(0, "failed to allocate memory"); + goto err; + } + + pixels = calloc(img->width, img->height); + if (!pixels) { + tool_err(0, "failed to allocate memory"); + goto err; + } + + mask_sz = npixels / CHAR_BIT + (npixels % CHAR_BIT != 0); + pixel_mask = malloc(mask_sz); + if (!pixel_mask) { + tool_err(0, "failed to allocate memory"); + goto err; } /* Figure out what images we're extracting. */ @@ -282,44 +416,44 @@ decode(struct lbx_image *img, FILE *palf, FILE *override, int fmt, char **argv) } if (usepalette) { - if (loadpalette(img, &info, palf, override, palette) == -1) { + if (loadpalette(img, palf, override, palette) == -1) { + ret = EXIT_FAILURE; goto err; } } /* Extract the images, in order. */ + ret = EXIT_SUCCESS; for (i = 0; i < img->frames; i++) { - unsigned char **data; - unsigned char **mask; + if (divides(img->chunk, i)) + memset(pixel_mask, 0, mask_sz); - if (!(framebits[i / CHAR_BIT] & (1 << (i % CHAR_BIT)))) - continue; - - data = lbx_img_getframe(img, i); - if (!data) { - tool_err(-1, "error in frame %u: %s", i, lbx_errmsg()); - continue; + rc = decode_frame(img, i, pixels, pixel_mask); + if (rc < 0) { + ret = EXIT_FAILURE; + goto err; } - mask = lbx_img_getmask(img); + if (framebits[i / CHAR_BIT] & (1u << (i % CHAR_BIT))) { + rc = output(i, &formats[fmt], pixels, pixel_mask, + img->width, img->height, + usepalette ? palette : NULL); - if (!output(i, &formats[fmt], data, mask, - img->width, img->height, - usepalette ? palette : NULL)) { - extracted = 1; + if (rc == 0) { + extracted = 1; + } } } if (!extracted) { tool_err(-1, "no frames extracted."); - goto err; + ret = EXIT_FAILURE; } - - free(framebits); - return EXIT_SUCCESS; err: + free(pixels); + free(pixel_mask); free(framebits); - return EXIT_FAILURE; + return ret; } int main(int argc, char **argv) @@ -327,28 +461,10 @@ int main(int argc, char **argv) int mode = MODE_NONE, fmt, opt, rc = EXIT_FAILURE; struct lbx_pipe_state stdin_handle = { .f = stdin }; const char *file = NULL, *fmtstring = NULL; + const char *ext_palette = NULL, *ovr_palette = NULL; FILE *palf = NULL, *overf = NULL; struct lbx_image *img; - 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' }, - { "format", 1, NULL, 'F' }, - { "palette", 1, NULL, 'p' }, - { "override", 1, NULL, 'p' }, - - { "version", 0, NULL, 'V' }, - { "usage", 0, NULL, 'U' }, - { "help", 0, NULL, 'H' }, - - { "no-palette", 0, NULL, 'n' }, - - { 0 } - }; - tool_init("lbximg", argc, argv); while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { switch(opt) { @@ -371,28 +487,20 @@ int main(int argc, char **argv) usepalette = 0; break; case 'p': - palf = fopen(optarg, "rb"); - if (!palf) { - tool_err(0, "failed to open %s", optarg); - return EXIT_FAILURE; - } + ext_palette = optarg; break; case 'O': - overf = fopen(optarg, "rb"); - if (!overf) { - tool_err(0, "failed to open %s", optarg); - return EXIT_FAILURE; - } + ovr_palette = optarg; + break; + case LOPT_OUTPUT_PREFIX: + outname = optarg; break; case 'V': tool_version(); return EXIT_SUCCESS; - case 'U': - printusage(); - return EXIT_SUCCESS; case 'H': - printhelp(); + print_help(); return EXIT_SUCCESS; default: return EXIT_FAILURE; @@ -418,26 +526,48 @@ int main(int argc, char **argv) return EXIT_FAILURE; } + if (ext_palette && !(palf = fopen(ext_palette, "rb"))) { + tool_err(0, "failed to open %s", optarg); + return EXIT_FAILURE; + } + + if (ovr_palette && !(overf = fopen(ovr_palette, "rb"))) { + tool_err(0, "failed to open %s", optarg); + return EXIT_FAILURE; + } + if (verbose || mode == MODE_IDENT) { - struct lbx_imginfo info; + int palette_count; if (!file) file = "stdin"; - lbx_img_getinfo(img, &info); + palette_count = lbx_img_getpalette(img, NULL); + if (palette_count < 0) { + tool_err(-1, "error reading image: %s", lbx_errmsg()); + return EXIT_FAILURE; + } + 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" : "", - info.looping ? ", loops" : ""); + palette_count ? ", embedded palette" : "", + img->chunk ? ", chunked" : "", + img->leadin+1 < img->frames ? ", loops" : ""); } switch (mode) { + case MODE_IDENT: + rc = 0; + break; case MODE_DECODE: rc = decode(img, palf, overf, fmt, &argv[optind]); break; } lbx_img_close(img); + if (palf) + fclose(palf); + if (overf) + fclose(overf); return rc; }