X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/d1728478ec0a212e2c601cfa911e24ee1018c83d..e5fa9ca748b73c6008754ce2c48e9a85a78a1f17:/src/image.c diff --git a/src/image.c b/src/image.c index 83bac21..4a0fdd8 100644 --- a/src/image.c +++ b/src/image.c @@ -1,7 +1,7 @@ /* * 2ooM: The Master of Orion II Reverse Engineering Project * Library for working with LBX image files. - * Copyright (C) 2006-2008 Nick Bowler + * 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 @@ -16,10 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#include #include #include #include @@ -28,19 +25,23 @@ #include "pack.h" #include "misc.h" #include "lbx.h" +#include "error.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; @@ -57,14 +58,14 @@ struct lbx_image { unsigned long offsets[]; }; -static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN]) +static struct lbx_image *lbx_img_init(unsigned char hdr[static HDR_LEN]) { unsigned short nframes = unpack_16_le(hdr+6); struct lbx_image *img; img = malloc(sizeof *img + sizeof img->offsets[0] * (nframes+1)); if (!img) { - lbx_errno = -errno; + lbx_error_raise(LBX_ENOMEM); return NULL; } @@ -72,8 +73,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, @@ -82,20 +85,19 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN]) return img; } -struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, - int (*destructor)(void *)) +struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops, + int (*destructor)(void *)) { unsigned char hdr_buf[HDR_LEN]; struct lbx_image *img; if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) { - lbx_errno = -errno; if (fops->eof(f)) - lbx_errno = LBX_EEOF; + lbx_error_raise(LBX_EEOF); return NULL; } - img = lbximg_init(hdr_buf); + img = lbx_img_init(hdr_buf); if (!img) return NULL; @@ -106,11 +108,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 */ @@ -118,9 +121,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, unsigned char buf[4]; if (fops->read(buf, sizeof buf, f) != sizeof buf) { - lbx_errno = -errno; if (fops->eof(f)) - lbx_errno = LBX_EEOF; + lbx_error_raise(LBX_EEOF); free(img); return NULL; } @@ -132,9 +134,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, unsigned char buf[4]; if (fops->read(buf, sizeof buf, f) != sizeof buf) { - lbx_errno = -errno; if (fops->eof(f)) - lbx_errno = LBX_EEOF; + lbx_error_raise(LBX_EEOF); free(img); return NULL; } @@ -144,7 +145,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops, img->paloff = fops->tell(f); if (img->palstart + img->palcount > 256) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); free(img); return NULL; } @@ -153,9 +154,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 fclose((FILE *)f); +} + +struct lbx_image *lbx_img_fopen(const char *file) { - return lbximg_open(f, &lbx_default_fops, NULL); + struct lbx_pipe_state *p; + FILE *f; + + f = fopen(file, "rb"); + if (!f) + return NULL; + + if (fseek(f, 0, SEEK_CUR) == 0) + return lbx_img_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 lbx_img_open(p, &lbx_pipe_fops, pipe_close); } static int _lbx_drawrow(int first, struct lbx_image *img) @@ -193,7 +226,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img) /* Ensure that the row fits in the image. */ if (img->height - img->currenty <= yval || xval >= img->width) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return -1; } @@ -203,7 +236,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img) xval = unpack_16_le(buf+2); if (img->width - img->currentx <= xval) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return -1; } img->currentx += xval; @@ -212,7 +245,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img) } if (count > img->width - img->currentx) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return -1; } @@ -232,9 +265,8 @@ static int _lbx_drawrow(int first, struct lbx_image *img) return 0; readerr: - lbx_errno = -errno; if (img->fops->eof(img->f)) - lbx_errno = LBX_EEOF; + lbx_error_raise(LBX_EEOF); return -1; } @@ -245,13 +277,13 @@ static unsigned char **allocframebuffer(size_t width, size_t height) tmp = calloc(height, width); if (!tmp) { - lbx_errno = -errno; + lbx_error_raise(LBX_ENOMEM); return NULL; } new = malloc(height * sizeof *new); if (!new) { - lbx_errno = -errno; + lbx_error_raise(LBX_ENOMEM); free(tmp); return NULL; } @@ -263,10 +295,35 @@ static unsigned char **allocframebuffer(size_t width, size_t height) return new; } -unsigned char **lbximg_getframe(struct lbx_image *img, int frame) +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)) { + return NULL; + } + + if (img->fops->read(img->framedata[0], size, img->f) != size) { + if (img->fops->eof(img->f)) + lbx_error_raise(LBX_EEOF); + return NULL; + } + memset(img->mask[0], 1, size); + + if (img->fops->tell(img->f) > img->offsets[frame+1]) { + lbx_error_raise(LBX_EFORMAT); + return NULL; + } + + return img->framedata; +} + +unsigned char **lbx_img_getframe(struct lbx_image *img, int frame) { if (frame >= img->frames || frame < 0) { - lbx_errno = LBX_ERANGE; + lbx_error_raise(LBX_ENOENT); return NULL; } @@ -282,19 +339,25 @@ 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) { - if (!lbximg_getframe(img, frame-1)) + if (!lbx_img_getframe(img, frame-1)) return NULL; } } @@ -303,7 +366,6 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) int rc, first = 1; if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) { - lbx_errno = -errno; return NULL; } @@ -314,7 +376,7 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) first = 0; if (img->fops->tell(img->f) > img->offsets[frame+1]) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return NULL; } } while (!rc); @@ -325,20 +387,21 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) } int -lbximg_loadpalette(void *f, const struct lbx_file_ops *fops, - struct lbx_colour palette[static 256]) +lbx_img_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 (fops->read(entry, sizeof entry, f) != sizeof entry) { - lbx_errno = (feof(f)) ? LBX_EEOF : -errno; + if (fops->eof(f)) + lbx_error_raise(LBX_EEOF); return -1; } if (entry[0] != 1) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return -1; } @@ -354,7 +417,7 @@ lbximg_loadpalette(void *f, const struct lbx_file_ops *fops, } int -lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) +lbx_img_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) { unsigned char entry[4]; unsigned int i; @@ -365,7 +428,6 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) return 0; if (img->fops->seek(img->f, img->paloff, SEEK_SET)) { - lbx_errno = -errno; return -1; } @@ -376,7 +438,7 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) } if (entry[0] != 0) { - lbx_errno = LBX_EFORMAT; + lbx_error_raise(LBX_EFORMAT); return -1; } @@ -390,16 +452,18 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) return 0; readerr: - lbx_errno = img->fops->eof(img->f) ? LBX_EEOF : -errno; + if (img->fops->eof(img->f)) + lbx_error_raise(LBX_EEOF); return -1; } -void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info) +void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info) { *info = (struct lbx_imginfo) { .width = img->width, .height = img->height, .nframes = img->frames, + .chunk = img->chunk, .palettesz = (img->flags & FLAG_PALETTE) ? img->palcount : 0, }; @@ -413,12 +477,12 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info) } } -unsigned char **lbximg_getmask(struct lbx_image *img) +unsigned char **lbx_img_getmask(struct lbx_image *img) { return img->mask; } -int lbximg_close(struct lbx_image *img) +int lbx_img_close(struct lbx_image *img) { int rc = 0;