#include "tools.h"
#include "image.h"
+#include "error.h"
#include "lbx.h"
/* Global flags */
static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
{
- LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+ LBXimg *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;
}
}
/* 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;
}
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) {
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;
}
if (file)
- img = lbximg_fopen(file);
+ img = lbx_img_fopen(file);
else
- img = lbximg_open(&stdin_handle, &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 (!file)
file = "stdin";
- lbximg_getinfo(img, &info);
+ 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,
info.palettesz ? ", embedded palette" : "",
break;
}
- lbximg_close(img);
+ lbx_img_close(img);
return rc;
}