X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/6f76664d36151ac3d9222b4ae436bab96e34f0b0..fc8dd8be3744680d93c490227be4db8628377d3c:/src/image.c diff --git a/src/image.c b/src/image.c index d583145..78cb8a5 100644 --- a/src/image.c +++ b/src/image.c @@ -30,17 +30,20 @@ #include "lbx.h" #include "image.h" +#define FLAG_RAW 0x0100 /* Image is stored as a flat array of bytes. */ #define FLAG_OVERWRITE 0x0400 /* Draw each frame on a clean slate (unsure). */ +#define FLAG_BUILDING 0x0800 /* Buildings have this, related to shadow? */ #define FLAG_PALETTE 0x1000 /* Image contains embedded palette. */ #define FLAG_LOOPING 0x2000 /* Loop over all frames in the image (unsure). */ -#define FLAG_ALL (FLAG_OVERWRITE|FLAG_PALETTE|FLAG_LOOPING) + +#define FLAG_ALL (FLAG_RAW|FLAG_OVERWRITE|FLAG_BUILDING|FLAG_PALETTE|FLAG_LOOPING) #define HDR_LEN 12 struct lbx_image { unsigned short width, height; unsigned short wtf, flags; - unsigned short frames, leadin; + unsigned char frames, wtf2, leadin, chunk; unsigned short palstart, palcount; const struct lbx_file_ops *fops; @@ -72,8 +75,10 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN]) .width = unpack_16_le(hdr+0), .height = unpack_16_le(hdr+2), .wtf = unpack_16_le(hdr+4), - .frames = unpack_16_le(hdr+6), - .leadin = unpack_16_le(hdr+8), + .frames = hdr[6], + .wtf2 = hdr[7], + .leadin = hdr[8], + .chunk = hdr[9], .flags = unpack_16_le(hdr+10), .currentframe = -1, @@ -106,11 +111,12 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, /* * DEBUG ONLY. These assertions exist to catch otherwise valid image * files which differ from what I believe to be true of all LBX images. - * If we never find any exceptions, we can replace the assertions with - * assumptions. + * When we can decode every image, then these assertions should be + * replaced with constraints. */ - _lbx_assert(img->wtf == 0); /* version? */ - _lbx_assert(img->frames > img->leadin); /* cmbtshp.lbx breaks this. */ + _lbx_assert(img->wtf == 0); /* version? */ + _lbx_assert(img->wtf2 == 0); /* very likely is simply reserved. */ + _lbx_assert(img->frames > img->leadin); _lbx_assert(!(img->flags & ~FLAG_ALL)); /* Read all offsets. Should be merged with identical code in lbx.c */ @@ -153,9 +159,41 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, return img; } -struct lbx_image *lbximg_fopen(FILE *f) +static int pipe_close(void *f) +{ + struct lbx_pipe_state *p = f; + int rc; + + rc = fclose(p->f); + free(p); + return rc; +} + +static int file_close(void *f) { - return lbximg_open(f, &lbx_default_fops, NULL); + return fclose((FILE *)f); +} + +struct lbx_image *lbximg_fopen(const char *file) +{ + struct lbx_pipe_state *p; + FILE *f; + + f = fopen(file, "rb"); + if (!f) + return NULL; + + if (fseek(f, 0, SEEK_CUR) == 0) + return lbximg_open(f, &lbx_default_fops, file_close); + + p = malloc(sizeof *p); + if (!p) { + fclose(f); + return NULL; + } + + *p = (struct lbx_pipe_state) { .f = f }; + return lbximg_open(p, &lbx_pipe_fops, pipe_close); } static int _lbx_drawrow(int first, struct lbx_image *img) @@ -263,6 +301,33 @@ static unsigned char **allocframebuffer(size_t width, size_t height) return new; } +static unsigned char **read_raw_frame(struct lbx_image *img, int frame) +{ + unsigned long size = img->width * img->height; + + assert(img->flags & FLAG_RAW); + + if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) { + lbx_errno = -errno; + return NULL; + } + + if (img->fops->read(img->framedata[0], size, img->f) != size) { + lbx_errno = -errno; + if (img->fops->eof(img->f)) + lbx_errno = LBX_EEOF; + return NULL; + } + memset(img->mask[0], 1, size); + + if (img->fops->tell(img->f) > img->offsets[frame+1]) { + lbx_errno = LBX_EFORMAT; + return NULL; + } + + return img->framedata; +} + unsigned char **lbximg_getframe(struct lbx_image *img, int frame) { if (frame >= img->frames || frame < 0) { @@ -282,15 +347,21 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) return NULL; } - if (img->flags & FLAG_OVERWRITE) { + if (img->flags & FLAG_RAW) + return read_raw_frame(img, frame); + + if ((img->flags & FLAG_OVERWRITE) + || (img->chunk && !(frame % img->chunk))) { /* Clear the slate. */ img->currentframe = -1; memset(img->framedata[0], 0, img->width * img->height); memset(img->mask[0], 0, img->width * img->height); } else { /* Start over if we are backtracking. */ - if (img->currentframe > frame) + if (img->currentframe > frame) { + memset(img->mask[0], 0, img->width * img->height); img->currentframe = -1; + } /* We must have previous frame decoded to continue. */ if (frame > img->currentframe + 1) { @@ -324,13 +395,15 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) return img->framedata; } -int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256]) +int +lbximg_loadpalette(void *f, const struct lbx_file_ops *fops, + struct lbx_colour palette[static 256]) { unsigned char entry[4]; int i; for (i = 0; i < 256; i++) { - if (fread(entry, sizeof entry, 1, f) != 1) { + if (fops->read(entry, sizeof entry, f) != sizeof entry) { lbx_errno = (feof(f)) ? LBX_EEOF : -errno; return -1; } @@ -340,10 +413,11 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256]) return -1; } - palette[i] = (struct lbx_colour){ - .red = entry[1] << 2, - .green = entry[2] << 2, - .blue = entry[3] << 2, + palette[i] = (struct lbx_colour) { + .red = entry[1] << 2, + .green = entry[2] << 2, + .blue = entry[3] << 2, + .active = 1, }; } @@ -368,7 +442,6 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) for (i = 0; i < img->palcount; i++) { rc = img->fops->read(entry, sizeof entry, img->f); - if (rc < sizeof entry) { goto readerr; } @@ -379,9 +452,10 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) } palette[img->palstart + i] = (struct lbx_colour){ - .red = entry[1] << 2, - .green = entry[2] << 2, - .blue = entry[3] << 2, + .red = entry[1] << 2, + .green = entry[2] << 2, + .blue = entry[3] << 2, + .active = 1, }; } @@ -397,6 +471,7 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info) .width = img->width, .height = img->height, .nframes = img->frames, + .chunk = img->chunk, .palettesz = (img->flags & FLAG_PALETTE) ? img->palcount : 0, };