X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/5ca921b28d5ca2964e19dad8f9b8614b2aebca4d..38a465378241d4c74b07fd7e4deaf2af09ff2bcb:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 43406f1..af59f5f 100644
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -61,14 +61,14 @@ enum {
 	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 +84,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);
@@ -316,7 +316,7 @@ int decode(struct lbx_image *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 +324,10 @@ int decode(struct lbx_image *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 +336,7 @@ int decode(struct lbx_image *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 +351,7 @@ int decode(struct lbx_image *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;
 		}
 	}
@@ -465,9 +465,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" : "");
 	}