X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/c1de95057ed86c206b9583bd21fcc2d6d4744e6c..HEAD:/src/image.c
diff --git a/src/image.c b/src/image.c
index 9bc4985..ed80565 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,432 +1,422 @@
/*
- * 2ooM: The Master of Orion II Reverse Engineering Project
- * Library for working with LBX image files.
- * Copyright (C) 2006-2008 Nick Bowler
+ * 2ooM: The Master of Orion II Reverse Engineering Project
+ * Library for working with LBX image files.
+ * Copyright © 2006-2011, 2013-2014 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 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.
+ * 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 .
+ * 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
+#include
+#include
#include
#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;
+/* States for image readout */
+enum {
+ READ_STATE_INIT,
+ READ_STATE_HEADER,
+ READ_STATE_DATA,
+ READ_STATE_DONE,
+};
+
+struct lbx_image_priv {
+ struct lbx_image pub;
+
unsigned short wtf, flags;
- unsigned short frames, leadin;
- unsigned short palstart, palcount;
+ unsigned char wtf2;
- FILE *f;
- long foff, paloff;
+ const struct lbx_file_ops *fops;
+ int (*dtor)(void *handle);
+ void *f;
- int currentframe;
- int currentx, currenty;
- unsigned char **framedata;
- unsigned char **mask;
+ /* State of frame readout */
+ unsigned currentx, currenty, currentn;
+ int read_state;
- unsigned long offsets[];
+ unsigned long offsets[FLEXIBLE_ARRAY_MEMBER];
};
-static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
+static struct lbx_image_priv *lbx_img_init(unsigned char *hdr)
{
unsigned short nframes = unpack_16_le(hdr+6);
- struct lbx_image *img;
+ struct lbx_image_priv *img;
img = malloc(sizeof *img + sizeof img->offsets[0] * (nframes+1));
if (!img) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
return NULL;
}
- *img = (struct lbx_image) {
- .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),
- .flags = unpack_16_le(hdr+10),
-
- .currentframe = -1,
+ *img = (struct lbx_image_priv) {
+ .pub.width = unpack_16_le(hdr+0),
+ .pub.height = unpack_16_le(hdr+2),
+ .wtf = unpack_16_le(hdr+4),
+ .pub.frames = hdr[6],
+ .wtf2 = hdr[7],
+ .pub.leadin = hdr[8],
+ .pub.chunk = hdr[9],
+ .flags = unpack_16_le(hdr+10),
};
+ if (img->flags & FLAG_OVERWRITE)
+ img->pub.chunk = 1;
+
+ if (img->flags & FLAG_LOOPING)
+ img->pub.leadin = 0;
+
+ if (img->pub.leadin >= img->pub.frames) {
+ lbx_error_raise(LBX_EFORMAT);
+ free(img);
+ return NULL;
+ }
+
return img;
}
-struct lbx_image *lbximg_fopen(FILE *f)
+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;
- size_t rc;
+ struct lbx_image_priv *img;
- if (fread(hdr_buf, 1, sizeof hdr_buf, f) != sizeof hdr_buf) {
- lbx_errno = -errno;
- if (feof(f))
- lbx_errno = LBX_EEOF;
+ if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
+ if (fops->eof(f))
+ lbx_error_raise(LBX_EEOF);
return NULL;
}
- img = lbximg_init(hdr_buf);
+ img = lbx_img_init(hdr_buf);
if (!img)
return NULL;
img->f = f;
- img->foff = sizeof hdr_buf;
+ img->fops = fops;
+ img->dtor = destructor;
/*
* 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->flags & ~FLAG_ALL));
/* Read all offsets. Should be merged with identical code in lbx.c */
- for (unsigned i = 0; i <= img->frames; i++) {
+ for (unsigned i = 0; i <= img->pub.frames; i++) {
unsigned char buf[4];
- if (fread(buf, 1, sizeof buf, f) != sizeof buf) {
- lbx_errno = -errno;
- if (feof(f))
- lbx_errno = LBX_EEOF;
+ if (fops->read(buf, sizeof buf, f) != sizeof buf) {
+ if (fops->eof(f))
+ lbx_error_raise(LBX_EEOF);
free(img);
return NULL;
}
img->offsets[i] = unpack_32_le(buf);
- img->foff += 4;
}
- if (img->flags & FLAG_PALETTE) {
- unsigned char buf[4];
-
- if (fread(buf, 1, sizeof buf, f) != sizeof buf) {
- lbx_errno = -errno;
- if (feof(f))
- lbx_errno = LBX_EEOF;
- free(img);
- return NULL;
- }
+ return &img->pub;
+}
- img->palstart = unpack_16_le(buf+0);
- img->palcount = unpack_16_le(buf+2);
- img->foff += sizeof buf;
- img->paloff = img->foff;
+static int pipe_close(void *f)
+{
+ struct lbx_pipe_state *p = f;
+ int rc;
- if (img->palstart + img->palcount > 256) {
- lbx_errno = LBX_EFORMAT;
- free(img);
- return NULL;
- }
- }
+ rc = fclose(p->f);
+ free(p);
+ return rc;
+}
- return img;
+static int file_close(void *f)
+{
+ return fclose((FILE *)f);
}
-static int _lbx_drawrow(int first, struct lbx_image *img)
+struct lbx_image *lbx_img_fopen(const char *file)
{
- unsigned short type, count, yval, xval;
- unsigned char buf[4];
- unsigned char *pos;
- size_t rc;
+ struct lbx_pipe_state *p;
+ FILE *f;
- assert(img->framedata);
- assert(img->mask);
+ f = fopen(file, "rb");
+ if (!f) {
+ lbx_error_raise(-errno);
+ return NULL;
+ }
- if (fread(buf, 1, sizeof buf, img->f) != sizeof buf)
- goto readerr;
- img->foff += 4;
- type = unpack_16_le(buf+0);
+ if (fseek(f, 0, SEEK_CUR) == 0)
+ return lbx_img_open(f, &lbx_default_fops, file_close);
- if (first) {
- img->currentx = 0;
- img->currenty = 0;
- type = 0;
+ p = malloc(sizeof *p);
+ if (!p) {
+ lbx_error_raise(LBX_ENOMEM);
+ fclose(f);
+ return NULL;
}
- if (type == 0) {
- yval = unpack_16_le(buf+2);
- if (yval == 1000)
- return 1;
+ *p = (struct lbx_pipe_state) { .f = f };
+ return lbx_img_open(p, &lbx_pipe_fops, pipe_close);
+}
- if (fread(buf, 1, sizeof buf, img->f) != sizeof buf)
- goto readerr;
- img->foff += 4;
- count = unpack_16_le(buf+0);
+int lbx_img_seek(struct lbx_image *pub, unsigned frame)
+{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
- xval = unpack_16_le(buf+2);
- if (xval == 1000)
- return 1;
+ if (frame >= pub->frames) {
+ lbx_error_raise(LBX_EINVAL);
+ return -1;
+ }
- /* Ensure that the row fits in the image. */
- if (img->height - img->currenty <= yval || xval >= img->width) {
- lbx_errno = LBX_EFORMAT;
+ if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
+ return -1;
+ }
+
+ if (!(img->flags & FLAG_RAW)) {
+ unsigned char buf[4];
+
+ /* Read frame header */
+ if (img->fops->read(buf, 4, img->f) != 4) {
+ if (img->fops->eof(img->f))
+ lbx_error_raise(LBX_EEOF);
return -1;
}
- img->currenty += yval;
- img->currentx = xval;
- } else {
- xval = unpack_16_le(buf+2);
-
- if (img->width - img->currentx <= xval) {
- lbx_errno = LBX_EFORMAT;
+ if (unpack_16_le(buf) != 1) {
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
- img->currentx += xval;
- count = type;
+ img->currentx = 0;
+ img->currenty = unpack_16_le(buf+2);
+ if (img->currenty > img->pub.height) {
+ lbx_error_raise(LBX_EFORMAT);
+ return -1;
+ }
}
- if (count > img->width - img->currentx) {
- lbx_errno = LBX_EFORMAT;
+ img->read_state = READ_STATE_HEADER;
+ return 0;
+}
+
+long lbx_img_read_row_header(struct lbx_image *pub, unsigned *x, unsigned *y)
+{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
+ unsigned short length, offset;
+ unsigned char buf[4];
+
+ if (img->read_state != READ_STATE_HEADER) {
+ lbx_error_raise(LBX_EINVAL);
return -1;
}
- memset(&img->mask[img->currenty][img->currentx], 1, count);
+ /* Raw images have no row headers */
+ if (img->flags & FLAG_RAW) {
+ img->currentn = img->pub.width;
+ *y = img->currenty++;
+ *x = 0;
+
+ if (*y < img->pub.height) {
+ img->read_state = READ_STATE_DATA;
+ return img->currentn;
+ } else {
+ img->read_state = READ_STATE_DONE;
+ return 0;
+ }
+ }
- pos = &img->framedata[img->currenty][img->currentx];
- rc = fread(pos, 1, count, img->f);
- img->currentx += rc;
- img->foff += rc;
+ do {
+ if (img->fops->read(buf, sizeof buf, img->f) != sizeof buf) {
+ if (img->fops->eof(img->f))
+ lbx_error_raise(LBX_EEOF);
+ return -1;
+ }
- if (rc < count)
- goto readerr;
+ length = unpack_16_le(buf+0);
+ offset = unpack_16_le(buf+2);
- if (count % 2) {
- if (fread(buf, 1, 1, img->f) != 1)
- goto readerr;
- img->foff += 1;
- }
-
- return 0;
-readerr:
- if (feof(img->f)) {
- lbx_errno = LBX_EEOF;
- } else {
- lbx_errno = -errno;
- }
- return -1;
-}
+ if (length == 0) {
+ if (offset == 1000) {
+ img->read_state = READ_STATE_DONE;
+ return 0;
+ } else if (offset > img->pub.height - img->currenty) {
+ lbx_error_raise(LBX_EFORMAT);
+ return -1;
+ }
-static unsigned char **allocframebuffer(size_t width, size_t height)
-{
- unsigned char **new, *tmp;
- size_t i;
+ img->currenty += offset;
+ img->currentx = 0;
+ }
+ } while (length == 0);
- tmp = calloc(height, width);
- if (!tmp) {
- lbx_errno = -errno;
- return NULL;
+ if (offset > img->pub.width - img->currentx) {
+ lbx_error_raise(LBX_EFORMAT);
+ return -1;
}
+ img->currentx += offset;
- new = malloc(height * sizeof *new);
- if (!new) {
- lbx_errno = -errno;
- free(tmp);
- return NULL;
+ if (length > img->pub.width - img->currentx) {
+ lbx_error_raise(LBX_EFORMAT);
+ return -1;
}
+ img->currentn = length;
- for (i = 0; i < height; i++) {
- new[i] = tmp + i * width;
- }
+ img->read_state = READ_STATE_DATA;
+ *x = img->currentx;
+ *y = img->currenty;
- return new;
+ return img->currentn;
}
-unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
+long lbx_img_read_row_data(struct lbx_image *pub, void *buf)
{
- if (frame >= img->frames || frame < 0) {
- lbx_errno = LBX_ERANGE;
- return NULL;
- }
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
- if (!img->framedata) {
- img->framedata = allocframebuffer(img->width, img->height);
- if (!img->framedata)
- return NULL;
+ if (img->read_state != READ_STATE_DATA) {
+ lbx_error_raise(LBX_EINVAL);
+ return -1;
}
- if (!img->mask) {
- img->mask = allocframebuffer(img->width, img->height);
- if (!img->mask)
- return NULL;
+ if (img->fops->read(buf, img->currentn, img->f) != img->currentn) {
+ if (img->fops->eof(img->f))
+ lbx_error_raise(LBX_EEOF);
+ return -1;
}
- /* Start over if we are backtracking. */
- if (img->currentframe > frame)
- img->currentframe == -1;
-
- 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) {
- if (!lbximg_getframe(img, frame-1))
- return NULL;
+ if (!(img->flags & FLAG_RAW) && img->currentn % 2) {
+ unsigned char c;
+
+ /* Skip padding byte */
+ if (img->fops->read(&c, 1, img->f) != 1) {
+ if (img->fops->eof(img->f))
+ lbx_error_raise(LBX_EEOF);
+ return -1;
}
}
- if (img->currentframe != frame) {
- int rc, first = 1;
+ img->read_state = READ_STATE_HEADER;
+ img->currentx += img->currentn;
- if (_lbx_fseek(img->f, &img->foff, img->offsets[frame]) == -1)
- return NULL;
-
- do {
- rc = _lbx_drawrow(first, img);
- if (rc == -1)
- return NULL;
- first = 0;
-
- if (!rc && img->foff > img->offsets[frame+1]) {
- lbx_errno = LBX_EFORMAT;
- return NULL;
- }
- } while (!rc);
- }
-
- img->currentframe = frame;
- return img->framedata;
+ return img->currentn;
}
-int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
+static int read_palette(void *f, const struct lbx_file_ops *fops,
+ struct lbx_colour *palette, unsigned count,
+ bool external)
{
- unsigned char entry[4];
- int i;
+ assert(count <= 256);
+ for (unsigned i = 0; i < count; i++) {
+ unsigned char buf[4];
- for (i = 0; i < 256; i++) {
- if (fread(entry, sizeof entry, 1, f) != 1) {
- lbx_errno = (feof(f)) ? LBX_EEOF : -errno;
+ if (fops->read(buf, 4, f) != 4) {
+ if (fops->eof(f))
+ lbx_error_raise(LBX_EEOF);
return -1;
}
- if (entry[0] != 1) {
- lbx_errno = LBX_EFORMAT;
+ if (buf[0] != external) {
+ lbx_error_raise(LBX_EFORMAT);
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 = buf[1] & 0x3f,
+ .green = buf[2] & 0x3f,
+ .blue = buf[3] & 0x3f,
+ .active = 1,
};
}
return 0;
}
-int
-lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
+int lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
+ struct lbx_colour *palette)
{
- unsigned char entry[4];
- unsigned int i;
- size_t rc;
+ return read_palette(f, fops, palette, 256, true);
+}
+
+int lbx_img_getpalette(struct lbx_image *pub, struct lbx_colour *out)
+{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
+ unsigned long palette_start, palette_count, palette_offset;
+ unsigned char buf[4];
+ int rc;
/* Do nothing if the image doesn't have embedded palette data. */
if (!(img->flags & FLAG_PALETTE))
return 0;
- if (_lbx_fseek(img->f, &img->foff, img->paloff) == -1)
+ palette_offset = 16 + 4ul * img->pub.frames;
+ if (img->fops->seek(img->f, palette_offset, SEEK_SET)) {
return -1;
+ }
- for (i = 0; i < img->palcount; i++) {
- rc = fread(entry, 1, sizeof entry, img->f);
- img->foff += rc;
+ /* Read embedded palette header */
+ if (img->fops->read(buf, 4, img->f) < 4)
+ goto readerr;
- if (rc < sizeof entry) {
- goto readerr;
- }
+ palette_start = unpack_16_le(buf+0);
+ palette_count = unpack_16_le(buf+2);
+ if (palette_start + palette_count > 256) {
+ lbx_error_raise(LBX_EFORMAT);
+ return -1;
+ }
- if (entry[0] != 0) {
- lbx_errno = LBX_EFORMAT;
+ if (out) {
+ rc = read_palette(img->f, img->fops,
+ out+palette_start, palette_count,
+ false);
+ if (rc < 0)
return -1;
- }
-
- palette[img->palstart + i] = (struct lbx_colour){
- .red = entry[1] << 2,
- .green = entry[2] << 2,
- .blue = entry[3] << 2,
- };
}
- return 0;
+ return palette_count;
readerr:
- lbx_errno = feof(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)
-{
- *info = (struct lbx_imginfo) {
- .width = img->width,
- .height = img->height,
- .nframes = img->frames,
- .palettesz = (img->flags & FLAG_PALETTE) ? img->palcount : 0,
- };
-
- /* There seems to be two ways of specifying that an image loops. */
- if (img->flags & FLAG_LOOPING) {
- info->loopstart = 0;
- info->looping = 1;
- } else if (img->leadin != img->frames - 1) {
- info->loopstart = img->leadin;
- info->looping = 1;
- }
-}
-
-unsigned char **lbximg_getmask(struct lbx_image *img)
-{
- return img->mask;
-}
-
-void lbximg_close(struct lbx_image *img)
+int lbx_img_close(struct lbx_image *pub)
{
- if (!img) return;
-
- if (img->framedata) {
- free(img->framedata[0]);
- free(img->framedata);
- }
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
+ int rc = 0;
- if (img->mask) {
- free(img->mask[0]);
- free(img->mask);
+ if (img && img->dtor) {
+ rc = img->dtor(img->f);
}
-
- if (img->f) {
- fclose(img->f);
- }
-
free(img);
+
+ return rc;
}