#include <getopt.h>
#include <errno.h>
-#include <png.h>
-
#include "tools.h"
#include "image.h"
#include "error.h"
#include "lbx.h"
+#include "imgoutput.h"
+
/* Global flags */
static int verbose = 0;
static char *outname = "out";
start = strtoul(str, &endptr, 0);
if (start >= frames) {
- errmsg("frame %lu out of range.\n", start);
+ tool_err(-1, "frame %lu out of range.", start);
return -1;
}
if (endptr == str) {
- errmsg("invalid frame range: %s.\n", str);
+ tool_err(-1, "invalid frame range: %s.", str);
return -1;
}
case '-':
end = strtoul(endptr+1, &endptr, 0);
if (end >= frames) {
- errmsg("frame %lu out of range.\n", end);
+ tool_err(-1, "frame %lu out of range.", end);
return -1;
}
end = frames - 1;
break;
default:
- errmsg("invalid frame range: %s.\n", str);
+ tool_err(-1, "invalid frame range: %s.", str);
return -1;
}
if (end < start) {
- errmsg("invalid frame range: %s.\n", str);
+ tool_err(-1, "invalid frame range: %s.", str);
return -1;
}
return 0;
}
-static int ismasked(unsigned char **mask, unsigned width, unsigned height)
-{
- unsigned y, x;
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- if (mask[y][x] == 0) return 1;
- }
- }
-
- return 0;
-}
-
int outpng(unsigned int frameno,
unsigned char **framedata, unsigned char **mask,
unsigned int width, unsigned int height,
struct lbx_colour palette[static 256])
{
char name[strlen(outname) + sizeof ".65535.png"];
- unsigned char *row;
- unsigned int x, y;
FILE *of;
-
- png_structp png;
- png_infop info;
+ int rc;
assert(frameno < 65536);
snprintf(name, sizeof name, "%s.%03d.png", outname, frameno);
- row = malloc(4 * width);
- if (!row) {
- errmsg("failed to allocate row buffer: %s\n", strerror(errno));
- return -1;
- }
-
of = fopen(name, "wb");
if (!of) {
- errmsg("failed to open %s: %s.\n", name, strerror(errno));
- free(row);
+ tool_err(0, "failed to open %s", name);
return -1;
}
- png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (!png) {
- errmsg("failed to init libpng.\n", 0);
- goto err;
- }
-
- info = png_create_info_struct(png);
- if (!info) {
- errmsg("failed to init libpng.\n", 0);
- png_destroy_write_struct(&png, NULL);
- goto err;
+ rc = img_output_png(of, name, width, height, framedata, mask, palette);
+ if (rc < 0) {
+ fclose(of);
+ return -1;
}
- if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct(&png, &info);
- goto err;
+ if (fclose(of) == EOF) {
+ tool_err(0, "error writing %s", name);
+ return -1;
}
-
- png_init_io(png, of);
-
- if (!ismasked(mask, width, height)) {
- /*
- * This case is easy; we can just feed the palette and pixel
- * 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_palette, 256);
- png_set_rows(png, info, framedata);
- png_write_png(png, info, PNG_TRANSFORM_IDENTITY, NULL);
- } else {
- /*
- * Unfortunately, LBX doesn't translate nicely to PNG here.
- * LBX has a 256 colour palette _plus_ transparency.
- * We'll form an RGBA PNG to deal with this.
- */
-
- png_set_IHDR(png, info, width, height, 8,
- PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
- PNG_COMPRESSION_TYPE_DEFAULT,
- PNG_FILTER_TYPE_DEFAULT);
-
- png_write_info(png, info);
-
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- row[4*x+0] = palette[framedata[y][x]].red;
- row[4*x+1] = palette[framedata[y][x]].green;
- row[4*x+2] = palette[framedata[y][x]].blue;
- row[4*x+3] = (mask[y][x]) ? -1 : 0;
- }
-
- png_write_row(png, row);
- }
-
- png_write_end(png, NULL);
- }
-
- png_destroy_write_struct(&png, &info);
- fclose(of);
- free(row);
-
if (verbose)
printf("wrote %s\n", name);
+
return 0;
-err:
- fclose(of);
- remove(name);
- free(row);
- return -1;
}
static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
struct lbx_imginfo info;
if (!overimg) {
- errmsg("failed to open override image: %s\n", lbx_errmsg());
+ tool_err(-1, "failed to open override image: %s", lbx_errmsg());
return -1;
}
lbx_img_getinfo(overimg, &info);
if (!info.palettesz) {
- errmsg("override image has no palette.\n", 0);
+ tool_err(-1, "override image has no palette.");
lbx_img_close(overimg);
return -1;
}
if (lbx_img_getpalette(overimg, palette) == -1) {
- errmsg("error reading override palette: %s\n", lbx_errmsg());
+ tool_err(-1, "error reading override palette: %s", lbx_errmsg());
lbx_img_close(overimg);
return -1;
}
{
int i;
- /* In no-palette mode, use palette indices for colour. */
- if (!usepalette) {
- for (i = 0; i < 256; i++) {
- palette[i] = (struct lbx_colour){i,i,i};
- }
-
- return 0;
- }
-
/* For sanity. */
if (!palf && !info->palettesz && !override) {
- errmsg("no palette available.\n", 0);
+ tool_err(-1, "no palette available.");
return -1;
}
/* Read the external palette, if any. */
if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) {
- errmsg("error reading external palette: %s\n", lbx_errmsg());
+ tool_err(-1, "error reading external palette: %s", lbx_errmsg());
return -1;
}
/* Read the embedded palette, if any. */
if (info->palettesz && lbx_img_getpalette(img, palette) == -1) {
- errmsg("error reading embedded palette: %s\n", lbx_errmsg());
+ tool_err(-1, "error reading embedded palette: %s", lbx_errmsg());
return -1;
}
}
}
- if (loadpalette(img, &info, palf, override, palette) == -1) {
- goto err;
+ if (usepalette) {
+ if (loadpalette(img, &info, palf, override, palette) == -1) {
+ goto err;
+ }
}
/* Extract the images, in order. */
data = lbx_img_getframe(img, i);
if (!data) {
- errmsg("error in frame %u: %s\n", i, lbx_errmsg());
+ tool_err(-1, "error in frame %u: %s", i, lbx_errmsg());
continue;
}
mask = lbx_img_getmask(img);
- if (!outpng(i, data, mask, img->width, img->height, palette)) {
+ if (!outpng(i, data, mask, img->width, img->height,
+ usepalette ? palette : NULL)) {
extracted = 1;
}
}
if (!extracted) {
- errmsg("no frames extracted.\n", 0);
+ tool_err(-1, "no frames extracted.");
goto err;
}
case 'p':
palf = fopen(optarg, "rb");
if (!palf) {
- errmsg("failed to open %s: %m\n", optarg);
+ tool_err(0, "failed to open %s", optarg);
return EXIT_FAILURE;
}
case 'O':
overf = fopen(optarg, "rb");
if (!overf) {
- errmsg("failed to open %s: %m\n", optarg);
+ tool_err(0, "failed to open %s", optarg);
return EXIT_FAILURE;
}
break;
}
if (mode == MODE_NONE) {
- errmsg("you must specify a mode.\n", 0);
+ tool_err(-1, "you must specify a mode.");
return EXIT_FAILURE;
}
img = lbx_img_open(&stdin_handle, &lbx_pipe_fops, NULL);
if (!img) {
- errmsg("failed to open image: %s.\n", lbx_errmsg());
+ tool_err(-1, "failed to open image: %s.", lbx_errmsg());
return EXIT_FAILURE;
}
projects / liblbx.git / blobdiff