X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/fa7c556d251ebcb41ef9709b4d85a2c820dee94b..c81b3f9cfa09bcf212214f006d879585774619e2:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index e5e3d07..ff38c89 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-2010 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
@@ -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;
 	}
 
@@ -139,26 +134,25 @@ int outpng(unsigned int frameno,
 
 	row = malloc(4 * width);
 	if (!row) {
-		errmsg("failed to allocate row buffer: %s\n", strerror(errno));
+		tool_err(0, "failed to allocate row buffer");
 		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);
+		tool_err(-1, "failed to init libpng.");
 		goto err;
 	}
 
 	info = png_create_info_struct(png);
 	if (!info) {
-		errmsg("failed to init libpng.\n", 0);
+		tool_err(-1, "failed to init libpng.");
 		png_destroy_write_struct(&png, NULL);
 		goto err;
 	}
@@ -235,32 +229,32 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-	LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+	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_errmsg());
+		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_errmsg());
-		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(LBXimg *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])
 {
@@ -277,7 +271,7 @@ static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
 
 	/* For sanity. */
 	if (!palf && !info->palettesz && !override) {
-		errmsg("no palette available.\n", 0);
+		tool_err(-1, "no palette available.");
 		return -1;
 	}
 
@@ -287,14 +281,14 @@ static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
 	}
 
 	/* Read the external palette, if any. */
-	if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
-		errmsg("error reading external palette: %s\n", lbx_errmsg());
+	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_errmsg());
+	if (info->palettesz && lbx_img_getpalette(img, palette) == -1) {
+		tool_err(-1, "error reading embedded palette: %s", lbx_errmsg());
 		return -1;
 	}
 
@@ -306,7 +300,7 @@ static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
 	return 0;
 }
 
-int decode(LBXimg *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];
@@ -314,9 +308,9 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 	int extracted = 0;
 	unsigned int i;
 
-	lbximg_getinfo(img, &info);
+	lbx_img_getinfo(img, &info);
 
-	framebits = calloc(1, info.nframes / CHAR_BIT + 1);
+	framebits = calloc(1, img->frames / CHAR_BIT + 1);
 	if (!framebits) {
 		return EXIT_FAILURE;
 	}
@@ -324,10 +318,10 @@ int decode(LBXimg *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);
 		}
 	}
 
@@ -336,28 +330,28 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 	}
 
 	/* 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_errmsg());
+			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, palette)) {
 			extracted = 1;
 		}
 	}
 
 	if (!extracted) {
-		errmsg("no frames extracted.\n", 0);
+		tool_err(-1, "no frames extracted.");
 		goto err;
 	}
 
@@ -374,7 +368,7 @@ int main(int argc, char **argv)
 	struct lbx_pipe_state stdin_handle = { .f = stdin };
 	FILE *palf = NULL, *overf = NULL;
 	const char *file = NULL;
-	LBXimg *img;
+	struct lbx_image *img;
 
 	static const char *sopts = "idnvf:p:O:V";
 	static const struct option lopts[] = {
@@ -394,7 +388,7 @@ int main(int argc, char **argv)
 		{ 0 }
 	};
 
-	progname = "lbximg"; /* argv[0]; */
+	tool_init("lbximg", argc, argv);
 	while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
 		switch(opt) {
 		case 'i':
@@ -415,7 +409,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;
 			}
 
@@ -423,12 +417,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();
@@ -443,17 +437,17 @@ 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;
 	}
 
 	if (file)
-		img = lbximg_fopen(file);
+		img = lbx_img_fopen(file);
 	else
-		img = lbximg_open(&stdin_handle, &lbx_pipe_fops, NULL);
+		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;
 	}
 
@@ -463,11 +457,11 @@ int main(int argc, char **argv)
 		if (!file)
 			file = "stdin";
 
-		lbximg_getinfo(img, &info);
+		lbx_img_getinfo(img, &info);
 		printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
-		       file, info.width, info.height, info.nframes,
+		       file, img->width, img->height, img->frames,
 		       info.palettesz ? ", embedded palette" : "",
-		       info.chunk     ? ", chunked" : "",
+		       img->chunk     ? ", chunked" : "",
 		       info.looping   ? ", loops" : "");
 	}
 
@@ -477,6 +471,6 @@ int main(int argc, char **argv)
 		break;
 	}
 
-	lbximg_close(img);
+	lbx_img_close(img);
 	return rc;
 }