X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/b0910e37f2dbf5b4e3dcd8bdfcef16d5d6b597cb..313abcb87669a8fd631f331fc94f749b838f3710:/src/lbximg.c
diff --git a/src/lbximg.c b/src/lbximg.c
index d56824c..af59f5f 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-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
- * 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 .
*/
-#define _GNU_SOURCE
+#include
#include
#include
#include
@@ -29,6 +29,7 @@
#include "tools.h"
#include "image.h"
+#include "error.h"
#include "lbx.h"
/* Global flags */
@@ -60,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;
}
@@ -83,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);
@@ -163,7 +164,6 @@ int outpng(unsigned int frameno,
}
if (setjmp(png_jmpbuf(png))) {
- free(row);
png_destroy_write_struct(&png, &info);
goto err;
}
@@ -176,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 {
@@ -214,12 +221,11 @@ int outpng(unsigned int frameno,
png_destroy_write_struct(&png, &info);
fclose(of);
+ free(row);
if (verbose)
printf("wrote %s\n", name);
-
return 0;
-
err:
fclose(of);
remove(name);
@@ -229,32 +235,32 @@ err:
static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
{
- LBX_IMG *overimg = lbximg_fopen(f);
+ 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])
{
@@ -281,14 +287,14 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
}
/* Read the external palette, if any. */
- if (palf && lbximg_loadpalette(palf, palette) == -1) {
- 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;
}
@@ -300,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];
@@ -308,9 +314,9 @@ 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 = malloc(info.nframes / CHAR_BIT + 1);
+ framebits = calloc(1, img->frames / CHAR_BIT + 1);
if (!framebits) {
return EXIT_FAILURE;
}
@@ -318,10 +324,10 @@ int decode(LBX_IMG *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);
}
}
@@ -330,22 +336,22 @@ int decode(LBX_IMG *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_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)) {
+ if (!outpng(i, data, mask, img->width, img->height, palette)) {
extracted = 1;
}
}
@@ -364,26 +370,26 @@ err:
int main(int argc, char **argv)
{
- int mode = MODE_NONE;
- FILE *inf = stdin, *palf = NULL, *overf = NULL;
- const char *name = "stdin";
- LBX_IMG *img;
- int opt;
+ int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
+ struct lbx_pipe_state stdin_handle = { .f = stdin };
+ FILE *palf = NULL, *overf = NULL;
+ 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 }
};
@@ -401,17 +407,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) {
- 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");
@@ -448,31 +447,36 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
- img = lbximg_fopen(inf);
+ if (file)
+ img = lbx_img_fopen(file);
+ else
+ 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, img->width, img->height, img->frames,
info.palettesz ? ", embedded palette" : "",
+ img->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;
+ lbx_img_close(img);
+ return rc;
}