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;
}
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);
static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
{
- LBXimg *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
+ struct lbx_image *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
struct lbx_imginfo info;
if (!overimg) {
return 0;
}
-static int loadpalette(LBXimg *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])
{
return 0;
}
-int decode(LBXimg *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];
lbx_img_getinfo(img, &info);
- framebits = calloc(1, info.nframes / CHAR_BIT + 1);
+ framebits = calloc(1, img->frames / CHAR_BIT + 1);
if (!framebits) {
return EXIT_FAILURE;
}
/* 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);
}
}
}
/* 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;
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;
}
}
struct lbx_pipe_state stdin_handle = { .f = stdin };
FILE *palf = NULL, *overf = NULL;
const char *file = NULL;
- LBXimg *img;
+ struct lbx_image *img;
static const char *sopts = "idnvf:p:O:V";
static const struct option lopts[] = {
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,
+ file, img->width, img->height, img->frames,
info.palettesz ? ", embedded palette" : "",
- info.chunk ? ", chunked" : "",
+ img->chunk ? ", chunked" : "",
info.looping ? ", loops" : "");
}