X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/f228da9594290408ee03ffddbd01eadefbf06f1d..4ec9360786d0bb19cffc76818c1a4c33043f68e1:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 50dff07..a7c60c6 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 a set of PNGs.
- *  Copyright (C) 2006-2008 Nick Bowler
+ *  Copyright © 2006-2011, 2013 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
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _GNU_SOURCE
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,12 +25,13 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <png.h>
-
 #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";
@@ -50,31 +50,26 @@ static void printhelp(void)
 	puts("For now, see the man page for detailed help.");
 }
 
-static const char *progname;
-#define errmsg(fmt, ...) (\
-	fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
-)
-
 enum {
 	MODE_NONE,
 	MODE_DECODE,
 	MODE_IDENT,
 };
 
-int parserange(struct lbx_imginfo *info, char *str, unsigned char *bits)
+int parserange(unsigned frames, char *str, unsigned char *bits)
 {
 	unsigned long start, end;
 	unsigned int i;
 	char *endptr;
 
 	start = strtoul(str, &endptr, 0);
-	if (start >= info->nframes) {
-		errmsg("frame %lu out of range.\n", start);
+	if (start >= frames) {
+		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;
 	}
 
@@ -84,21 +79,21 @@ int parserange(struct lbx_imginfo *info, char *str, unsigned char *bits)
 		break;
 	case '-':
 		end = strtoul(endptr+1, &endptr, 0);
-		if (end >= info->nframes) {
-			errmsg("frame %lu out of range.\n", end);
+		if (end >= frames) {
+			tool_err(-1, "frame %lu out of range.", end);
 			return -1;
 		}
 
 		if (endptr == str)
-			end = info->nframes - 1;
+			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;
 	}
 
@@ -109,170 +104,77 @@ int parserange(struct lbx_imginfo *info, 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,
            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;
-
-	png_structp png;
-	png_infop   info;
+	int rc;
 
 	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;
-	}
-
 	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 = img_output_png(of, name, width, height, framedata, mask, palette);
+	if (rc < 0) {
+		fclose(of);
+		return -1;
 	}
 
-	if (setjmp(png_jmpbuf(png))) {
-		free(row);
-		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_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_colorp)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);
-
 	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])
 {
-	LBX_IMG *overimg = lbximg_fopen(f);
+	struct lbx_image *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
 	struct lbx_imginfo info;
 
 	if (!overimg) {
-		errmsg("failed to open override image: %s\n", lbx_strerror());
+		tool_err(-1, "failed to open override image: %s", lbx_errmsg());
 		return -1;
 	}
-	lbximg_getinfo(overimg, &info);
+	lbx_img_getinfo(overimg, &info);
 
 	if (!info.palettesz) {
-		errmsg("override image has no palette.\n", 0);
-		lbximg_close(overimg);
+		tool_err(-1, "override image has no palette.");
+		lbx_img_close(overimg);
 		return -1;
 	}
 
-	if (lbximg_getpalette(overimg, palette) == -1) {
-		errmsg("error reading override palette: %s\n", lbx_strerror());
-		lbximg_close(overimg);
+	if (lbx_img_getpalette(overimg, palette) == -1) {
+		tool_err(-1, "error reading override palette: %s", lbx_errmsg());
+		lbx_img_close(overimg);
 		return -1;
 	}
 
-	lbximg_close(overimg);
+	lbx_img_close(overimg);
 	return 0;
 }
 
-static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
+static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info,
                        FILE *palf, FILE *override,
                        struct lbx_colour palette[static 256])
 {
 	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;
 	}
 
@@ -282,14 +184,14 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
 	}
 
 	/* Read the external palette, if any. */
-	if (palf && lbximg_loadpalette(palf, palette) == -1) {
-		errmsg("error reading external palette: %s\n", lbx_strerror());
+	if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) {
+		tool_err(-1, "error reading external palette: %s", lbx_errmsg());
 		return -1;
 	}
 
 	/* Read the embedded palette, if any. */
-	if (info->palettesz && lbximg_getpalette(img, palette) == -1) {
-		errmsg("error reading embedded palette: %s\n", lbx_strerror());
+	if (info->palettesz && lbx_img_getpalette(img, palette) == -1) {
+		tool_err(-1, "error reading embedded palette: %s", lbx_errmsg());
 		return -1;
 	}
 
@@ -301,7 +203,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
 	return 0;
 }
 
-int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
+int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv)
 {
 	unsigned char *framebits;
 	struct lbx_colour palette[256];
@@ -309,9 +211,9 @@ int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
 	int extracted = 0;
 	unsigned int i;
 
-	lbximg_getinfo(img, &info);
+	lbx_img_getinfo(img, &info);
 
-	framebits = malloc(info.nframes / CHAR_BIT + 1);
+	framebits = calloc(1, img->frames / CHAR_BIT + 1);
 	if (!framebits) {
 		return EXIT_FAILURE;
 	}
@@ -319,40 +221,43 @@ int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
 	/* Figure out what images we're extracting. */
 	if (!argv[0]) {
 		/* extract all images by default. */
-		memset(framebits, -1, info.nframes / CHAR_BIT + 1);
+		memset(framebits, -1, img->frames / CHAR_BIT + 1);
 	} else {
 		for (i = 0; argv[i]; i++) {
-			parserange(&info, argv[i], framebits);
+			parserange(img->frames, argv[i], framebits);
 		}
 	}
 
-	if (loadpalette(img, &info, palf, override, palette) == -1) {
-		goto err;
+	if (usepalette) {
+		if (loadpalette(img, &info, palf, override, palette) == -1) {
+			goto err;
+		}
 	}
 
 	/* Extract the images, in order. */
-	for (i = 0; i < info.nframes; i++) {
+	for (i = 0; i < img->frames; i++) {
 		unsigned char **data;
 		unsigned char **mask;
 
 		if (!(framebits[i / CHAR_BIT] & (1 << (i % CHAR_BIT))))
 			continue;
 
-		data = lbximg_getframe(img, i);
+		data = lbx_img_getframe(img, i);
 		if (!data) {
-			errmsg("error in frame %u: %s\n", i, lbx_strerror());
+			tool_err(-1, "error in frame %u: %s", i, lbx_errmsg());
 			continue;
 		}
 
-		mask = lbximg_getmask(img);
+		mask = lbx_img_getmask(img);
 
-		if (!outpng(i, data, mask, info.width, info.height, palette)) {
+		if (!outpng(i, data, mask, img->width, img->height,
+			    usepalette ? palette : NULL)) {
 			extracted = 1;
 		}
 	}
 
 	if (!extracted) {
-		errmsg("no frames extracted.\n", 0);
+		tool_err(-1, "no frames extracted.");
 		goto err;
 	}
 
@@ -365,31 +270,31 @@ err:
 
 int main(int argc, char **argv)
 {
-	int mode = MODE_NONE;
-	FILE *inf = stdin, *palf = NULL, *overf = NULL;
-	const char *name = "stdin";
-	LBX_IMG *img;
-	int opt;
+	int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
+	struct lbx_pipe_state stdin_handle = { .f = stdin };
+	FILE *palf = NULL, *overf = NULL;
+	const char *file = NULL;
+	struct lbx_image *img;
 
-	static const char *sopts = "idvf:p:O:V";
+	static const char *sopts = "idnvf:p:O:V";
 	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' },
+		{ "ident",      0, NULL, 'i' },
+		{ "decode",     0, NULL, 'd' },
+		{ "verbose",    0, NULL, 'v' },
+		{ "file",       1, NULL, 'f' },
+		{ "palette",    1, NULL, 'p' },
+		{ "override",   1, NULL, 'p' },
 
-		{ "version",  0, NULL, 'V' },
-		{ "usage",    0, NULL, 'U' },
-		{ "help",     0, NULL, 'H' },
+		{ "version",    0, NULL, 'V' },
+		{ "usage",      0, NULL, 'U' },
+		{ "help",       0, NULL, 'H' },
 
-		{ "nopalette", 0, &usepalette, 0 },
+		{ "no-palette", 0, NULL, 'n' },
 
 		{ 0 }
 	};
 
-	progname = "lbximg"; /* argv[0]; */
+	tool_init("lbximg", argc, argv);
 	while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
 		switch(opt) {
 		case 'i':
@@ -402,22 +307,15 @@ int main(int argc, char **argv)
 			verbose = 1;
 			break;
 		case 'f':
-			if (strcmp(optarg, "-") == 0)
-				break;
-
-			name = strrchr(optarg, '/');
-			name = name ? name+1 : optarg;
-
-			inf = fopen(optarg, "rb");
-			if (!inf) {
-				errmsg("failed to open %s: %m\n", optarg);
-				return EXIT_FAILURE;
-			}
+			file = optarg;
+			break;
+		case 'n':
+			usepalette = 0;
 			break;
 		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;
 			}
 
@@ -425,12 +323,12 @@ 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 'V':
-			puts(VERSION_BOILERPLATE("lbximg"));
+			tool_version();
 			return EXIT_SUCCESS;
 		case 'U':
 			printusage();
@@ -445,35 +343,40 @@ int main(int argc, char **argv)
 	}
 
 	if (mode == MODE_NONE) {
-		errmsg("you must specify a mode.\n", 0);
+		tool_err(-1, "you must specify a mode.");
 		return EXIT_FAILURE;
 	}
 
-	img = lbximg_fopen(inf);
+	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_strerror());
+		tool_err(-1, "failed to open image: %s.", lbx_errmsg());
 		return EXIT_FAILURE;
 	}
 
 	if (verbose || mode == MODE_IDENT) {
 		struct lbx_imginfo info;
-		lbximg_getinfo(img, &info);
 
+		if (!file)
+			file = "stdin";
+
+		lbx_img_getinfo(img, &info);
 		printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
-		       name, info.width, info.height, info.nframes,
+		       file, img->width, img->height, img->frames,
 		       info.palettesz ? ", embedded palette" : "",
+		       img->chunk     ? ", chunked" : "",
 		       info.looping   ? ", loops" : "");
 	}
 
 	switch (mode) {
 	case MODE_DECODE:
-		if (decode(img, palf, overf, &argv[optind])) {
-			lbximg_close(img);
-			return EXIT_FAILURE;
-		}
+		rc = decode(img, palf, overf, &argv[optind]);
 		break;
 	}
 
-	lbximg_close(img);
-	return EXIT_SUCCESS;
+	lbx_img_close(img);
+	return rc;
 }