X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/67c2273969a556d9f54e027e5a520280fcc86d54..91689c5ef8174cc65e1f3ce31f9869778b2af671:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 730c0af..933e1e0 100644
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -1,22 +1,22 @@
-/* 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
+/*
+ *  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
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ *  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
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  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>
 #include <string.h>
@@ -27,6 +27,7 @@
 
 #include <png.h>
 
+#include "tools.h"
 #include "image.h"
 #include "lbx.h"
 
@@ -35,6 +36,19 @@ static int verbose = 0;
 static char *outname = "out";
 static int usepalette = 1;
 
+static void printusage(void)
+{
+	puts("usage: lbximg [-i|-d] [-v] [-p palette_file] [-O override_file]"
+	                  " [-f path]");
+	puts("              [frameno ...]");
+}
+
+static void printhelp(void)
+{
+	printusage();
+	puts("For now, see the man page for detailed help.");
+}
+
 static const char *progname;
 #define errmsg(fmt, ...) (\
 	fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
@@ -162,12 +176,19 @@ int outpng(unsigned int frameno,
 		 * data to libpng and let it do its magic.
 		 */
 
+		png_color png_palette[256];
+		for (unsigned i = 0; i < 256; i++) {
+			png_palette[i].red   = palette[i].red;
+			png_palette[i].green = palette[i].green;
+			png_palette[i].blue  = palette[i].blue;
+		}
+
 		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_PLTE(png, info, png_palette, 256);
 		png_set_rows(png, info, framedata);
 		png_write_png(png, info, PNG_TRANSFORM_IDENTITY, NULL);
 	} else {
@@ -224,7 +245,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 	}
 	lbximg_getinfo(overimg, &info);
 
-	if (!info.haspalette) {
+	if (!info.palettesz) {
 		errmsg("override image has no palette.\n", 0);
 		lbximg_close(overimg);
 		return -1;
@@ -256,7 +277,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
 	}
 
 	/* For sanity. */
-	if (!palf && !info->haspalette && !override) {
+	if (!palf && !info->palettesz && !override) {
 		errmsg("no palette available.\n", 0);
 		return -1;
 	}
@@ -267,13 +288,13 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
 	}
 
 	/* Read the external palette, if any. */
-	if (palf && lbximg_loadpalette(palf, palette) == -1) {
+	if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
 		errmsg("error reading external palette: %s\n", lbx_strerror());
 		return -1;
 	}
 
 	/* Read the embedded palette, if any. */
-	if (info->haspalette && lbximg_getpalette(img, palette) == -1) {
+	if (info->palettesz && lbximg_getpalette(img, palette) == -1) {
 		errmsg("error reading embedded palette: %s\n", lbx_strerror());
 		return -1;
 	}
@@ -350,21 +371,25 @@ err:
 
 int main(int argc, char **argv)
 {
-	int mode = MODE_NONE;
-	FILE *inf = stdin, *palf = NULL, *overf = NULL;
+	int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
+	struct lbx_pipe_state state = { .f = stdin };
+	FILE *palf = NULL, *overf = NULL;
 	const char *name = "stdin";
 	LBX_IMG *img;
-	int opt;
 
-	static const char *sopts = "idvf:p:O:";
+	static const char *sopts = "idvf:p:O:V";
 	static const struct option lopts[] = {
-		{ "info",     0, NULL, 'i' },
+		{ "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' },
+
 		{ "nopalette", 0, &usepalette, 0 },
 
 		{ 0 }
@@ -383,14 +408,10 @@ 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) {
+			if (!freopen(optarg, "rb", state.f)) {
 				errmsg("failed to open %s: %m\n", optarg);
 				return EXIT_FAILURE;
 			}
@@ -410,6 +431,15 @@ int main(int argc, char **argv)
 				return EXIT_FAILURE;
 			}
 			break;
+		case 'V':
+			puts(VERSION_BOILERPLATE("lbximg"));
+			return EXIT_SUCCESS;
+		case 'U':
+			printusage();
+			return EXIT_SUCCESS;
+		case 'H':
+			printhelp();
+			return EXIT_SUCCESS;
 		case '?':
 		case ':':
 			return EXIT_FAILURE;
@@ -421,7 +451,11 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	img = lbximg_fopen(inf);
+	if (fseek(state.f, 0, SEEK_CUR) == 0)
+		img = lbximg_open(state.f, &lbx_default_fops, NULL);
+	else
+		img = lbximg_open(&state, &lbx_pipe_fops, NULL);
+
 	if (!img) {
 		errmsg("failed to open image: %s.\n", lbx_strerror());
 		return EXIT_FAILURE;
@@ -433,19 +467,17 @@ int main(int argc, char **argv)
 
 		printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
 		       name, info.width, info.height, info.nframes,
-		       info.haspalette ? ", embedded palette" : "",
-		       info.looping    ? ", loops" : "");
+		       info.palettesz ? ", embedded palette" : "",
+		       info.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;
+	return rc;
 }