X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/e5fa9ca748b73c6008754ce2c48e9a85a78a1f17..5749c5e97a8b984720cef75f328944270874d713:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index fc12a73..581a33a 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,25 +50,20 @@ 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) {
+	if (start >= frames) {
 		errmsg("frame %lu out of range.\n", start);
 		return -1;
 	}
@@ -84,13 +79,13 @@ int parserange(struct lbx_imginfo *info, char *str, unsigned char *bits)
 		break;
 	case '-':
 		end = strtoul(endptr+1, &endptr, 0);
-		if (end >= info->nframes) {
+		if (end >= frames) {
 			errmsg("frame %lu out of range.\n", end);
 			return -1;
 		}
 
 		if (endptr == str)
-			end = info->nframes - 1;
+			end = frames - 1;
 		break;
 	default:
 		errmsg("invalid frame range: %s.\n", str);
@@ -235,7 +230,7 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-	LBXimg *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
+	struct lbx_image *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
 	struct lbx_imginfo info;
 
 	if (!overimg) {
@@ -260,7 +255,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 	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])
 {
@@ -306,7 +301,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];
@@ -316,7 +311,7 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 
 	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 +319,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,7 +331,7 @@ 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;
 
@@ -351,7 +346,7 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 
 		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;
 		}
 	}
@@ -374,7 +369,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 +389,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':
@@ -428,7 +423,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		case 'V':
-			puts(VERSION_BOILERPLATE("lbximg"));
+			tool_version();
 			return EXIT_SUCCESS;
 		case 'U':
 			printusage();
@@ -465,9 +460,9 @@ int main(int argc, char **argv)
 
 		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" : "");
 	}