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

diff --git a/src/lbximg.c b/src/lbximg.c
index 1173538..43406f1 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 (C) 2006-2010 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
@@ -29,6 +29,7 @@
 
 #include "tools.h"
 #include "image.h"
+#include "error.h"
 #include "lbx.h"
 
 /* Global flags */
@@ -234,32 +235,32 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-	LBX_IMG *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_strerror());
+		errmsg("failed to open override image: %s\n", 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);
+		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) {
+		errmsg("error reading override palette: %s\n", 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])
 {
@@ -286,14 +287,14 @@ static int loadpalette(LBX_IMG *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_strerror());
+	if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) {
+		errmsg("error reading external palette: %s\n", 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) {
+		errmsg("error reading embedded palette: %s\n", lbx_errmsg());
 		return -1;
 	}
 
@@ -305,7 +306,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];
@@ -313,7 +314,7 @@ 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 = calloc(1, info.nframes / CHAR_BIT + 1);
 	if (!framebits) {
@@ -342,13 +343,13 @@ int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
 		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());
+			errmsg("error in frame %u: %s\n", i, lbx_errmsg());
 			continue;
 		}
 
-		mask = lbximg_getmask(img);
+		mask = lbx_img_getmask(img);
 
 		if (!outpng(i, data, mask, info.width, info.height, palette)) {
 			extracted = 1;
@@ -370,25 +371,25 @@ err:
 int main(int argc, char **argv)
 {
 	int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
-	struct lbx_pipe_state state = { .f = stdin };
+	struct lbx_pipe_state stdin_handle = { .f = stdin };
 	FILE *palf = NULL, *overf = NULL;
-	const char *name = "stdin";
-	LBX_IMG *img;
+	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 }
 	};
@@ -406,13 +407,10 @@ int main(int argc, char **argv)
 			verbose = 1;
 			break;
 		case 'f':
-			name = strrchr(optarg, '/');
-			name = name ? name+1 : optarg;
-
-			if (!freopen(optarg, "rb", state.f)) {
-				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");
@@ -449,22 +447,25 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	if (fseek(state.f, 0, SEEK_CUR) == 0)
-		img = lbximg_open(state.f, &lbx_default_fops, NULL);
+	if (file)
+		img = lbx_img_fopen(file);
 	else
-		img = lbximg_open(&state, &lbx_pipe_fops, NULL);
+		img = lbx_img_open(&stdin_handle, &lbx_pipe_fops, NULL);
 
 	if (!img) {
-		errmsg("failed to open image: %s.\n", lbx_strerror());
+		errmsg("failed to open image: %s.\n", 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, info.width, info.height, info.nframes,
 		       info.palettesz ? ", embedded palette" : "",
 		       info.chunk     ? ", chunked" : "",
 		       info.looping   ? ", loops" : "");
@@ -476,6 +477,6 @@ int main(int argc, char **argv)
 		break;
 	}
 
-	lbximg_close(img);
+	lbx_img_close(img);
 	return rc;
 }