X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/488ae1c1e2b6e1767792010e4ea1f0e9447719d5..ff5bd81012bba4202487c9a5bf7649bd63ca4bae:/src/image.c diff --git a/src/image.c b/src/image.c index 2d34b52..3043861 100644 --- a/src/image.c +++ b/src/image.c @@ -1,3 +1,21 @@ +/* + * 2ooM: The Master of Orion II Reverse Engineering Project + * Library for working with LBX image files. + * Copyright (C) 2006-2008 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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 @@ -22,13 +40,15 @@ struct lbx_image { uint16_t wtf1; uint16_t frames, leadin; uint16_t flags; + uint16_t palstart, palcount; FILE *f; - long foff; + long foff, paloff; int currentframe; int currentx, currenty; unsigned char **framedata; + unsigned char **mask; uint32_t offsets[]; }; @@ -52,12 +72,6 @@ struct lbx_image *lbximg_fopen(FILE *f) tmp.leadin = letohs(tmp.leadin); tmp.foff += sizeof tmp.leadin; tmp.flags = letohs(tmp.flags); tmp.foff += sizeof tmp.flags; - /* Format constraints. */ - if (tmp.frames <= tmp.leadin) { - lbx_errno = LBX_EFORMAT; - return NULL; - } - /* * DEBUG ONLY. These assertions exist to catch otherwise valid image * files which differ from what I believe to be true of all LBX images. @@ -65,6 +79,7 @@ struct lbx_image *lbximg_fopen(FILE *f) * assumptions. */ _lbx_assert(tmp.wtf1 == 0); + _lbx_assert(tmp.frames > tmp.leadin); /* cmbtshp.lbx breaks this. */ _lbx_assert(!(tmp.flags & ~(FLAG_PALETTE|FLAG_OVERWRITE|FLAG_LOOPING))); new = malloc(sizeof *new + (tmp.frames+1) * sizeof *new->offsets); @@ -81,6 +96,24 @@ struct lbx_image *lbximg_fopen(FILE *f) goto readerr; new->foff += sizeof *new->offsets * (new->frames+1); + if (new->flags & FLAG_PALETTE) { + if (fread(&new->palstart, sizeof new->palstart, 1, f) != 1) + goto readerr; + if (fread(&new->palcount, sizeof new->palcount, 1, f) != 1) + goto readerr; + + new->palstart = letohs(new->palstart); + new->palcount = letohs(new->palcount); + new->foff += sizeof new->palstart + sizeof new->palcount; + new->paloff = new->foff; + + if (new->palstart + new->palcount > 256) { + lbx_errno = LBX_EFORMAT; + free(new); + return NULL; + } + } + return new; readerr: if (feof(f)) { @@ -101,6 +134,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img) size_t rc; assert(img->framedata); + assert(img->mask); if (fread(&type, sizeof type, 1, img->f) != 1) goto readerr; type = letohs(type); img->foff += sizeof type; @@ -150,6 +184,8 @@ static int _lbx_drawrow(int first, struct lbx_image *img) return -1; } + memset(&img->mask[img->currenty][img->currentx], 1, count); + pos = &img->framedata[img->currenty][img->currentx]; rc = fread(pos, 1, count, img->f); img->currentx += rc; @@ -174,6 +210,31 @@ readerr: return -1; } +static unsigned char **allocframebuffer(size_t width, size_t height) +{ + unsigned char **new, *tmp; + size_t i; + + tmp = calloc(height, width); + if (!tmp) { + lbx_errno = -errno; + return NULL; + } + + new = malloc(height * sizeof *new); + if (!new) { + lbx_errno = -errno; + free(tmp); + return NULL; + } + + for (i = 0; i < height; i++) { + new[i] = tmp + i * width; + } + + return new; +} + unsigned char **lbximg_getframe(struct lbx_image *img, int frame) { if (frame >= img->frames || frame < 0) { @@ -182,25 +243,15 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) } if (!img->framedata) { - unsigned char *tmp; - int i; - - tmp = malloc(img->width * img->height); - if (!tmp) { - lbx_errno = -errno; + img->framedata = allocframebuffer(img->width, img->height); + if (!img->framedata) return NULL; - } + } - img->framedata = malloc(img->height * sizeof *img->framedata); - if (!img->framedata) { - lbx_errno = -errno; - free(tmp); + if (!img->mask) { + img->mask = allocframebuffer(img->width, img->height); + if (!img->mask) return NULL; - } - - for (i = 0; i < img->height; i++) { - img->framedata[i] = tmp + i * img->width; - } } /* Start over if we are backtracking. */ @@ -210,6 +261,7 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame) if (img->flags & FLAG_OVERWRITE) { /* Clear the slate. */ memset(img->framedata[0], 0, img->width * img->height); + memset(img->mask[0], 0, img->width * img->height); } else { /* We must have previous frame decoded to continue. */ if (frame > img->currentframe + 1) { @@ -270,38 +322,19 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256]) int lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) { - size_t hdrlen = 6*(sizeof img->wtf1)+(img->frames+1)*(sizeof *img->offsets); unsigned int i; size_t rc; - uint16_t start, count; uint8_t entry[4]; /* Do nothing if the image doesn't have embedded palette data. */ if (!(img->flags & FLAG_PALETTE)) return 0; - /* Palette data is located right after the header. */ - if (_lbx_fseek(img->f, &img->foff, hdrlen) == -1) + if (_lbx_fseek(img->f, &img->foff, img->paloff) == -1) return -1; - /* Palette header */ - if (fread(&start, sizeof start, 1, img->f) != 1) goto readerr; - if (fread(&count, sizeof count, 1, img->f) != 1) goto readerr; - start = letohs(start); img->foff += sizeof start; - count = letohs(count); img->foff += sizeof count; - - if (start + count > 256) { - lbx_errno = LBX_EFORMAT; - return -1; - } - - if (hdrlen + 2*sizeof start + count*sizeof entry > img->offsets[0]) { - lbx_errno = LBX_EFORMAT; - return -1; - } - - for (i = 0; i < count; i++) { + for (i = 0; i < img->palcount; i++) { rc = fread(entry, 1, sizeof entry, img->f); img->foff += rc; @@ -314,7 +347,7 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256]) return -1; } - palette[start + i] = (struct lbx_colour){ + palette[img->palstart + i] = (struct lbx_colour){ .red = entry[1] << 2, .green = entry[2] << 2, .blue = entry[3] << 2, @@ -333,7 +366,7 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info) .width = img->width, .height = img->height, .nframes = img->frames, - .haspalette = (_Bool)(img->flags & FLAG_PALETTE), + .palettesz = (img->flags & FLAG_PALETTE) ? img->palcount : 0, }; /* There seems to be two ways of specifying that an image loops. */ @@ -346,6 +379,11 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info) } } +unsigned char **lbximg_getmask(struct lbx_image *img) +{ + return img->mask; +} + void lbximg_close(struct lbx_image *img) { if (!img) return; @@ -355,6 +393,11 @@ void lbximg_close(struct lbx_image *img) free(img->framedata); } + if (img->mask) { + free(img->mask[0]); + free(img->mask); + } + if (img->f) { fclose(img->f); }