X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/430be3ec2f86aec28fa21558b3141a2e28efd848..5c17ab8c0a5b2f66dac19031fd5394377cf375bb:/src/image.c

diff --git a/src/image.c b/src/image.c
index 0caca96..adc6a43 100644
--- a/src/image.c
+++ b/src/image.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <stdbool.h>
 #include <inttypes.h>
 #include <errno.h>
 
@@ -52,22 +53,15 @@ struct lbx_image_priv {
 
 	unsigned short wtf, flags;
 	unsigned char  wtf2;
-	unsigned short palstart, palcount;
 
 	const struct lbx_file_ops *fops;
 	int (*dtor)(void *handle);
 	void *f;
 
-	long paloff;
-
 	/* State of frame readout */
 	unsigned currentx, currenty, currentn;
 	int read_state;
 
-	int currentframe;
-	unsigned char **framedata;
-	unsigned char **mask;
-
 	unsigned long offsets[];
 };
 
@@ -91,8 +85,6 @@ static struct lbx_image_priv *lbx_img_init(unsigned char hdr[static HDR_LEN])
 		.pub.leadin = hdr[8],
 		.pub.chunk  = hdr[9],
 		.flags      = unpack_16_le(hdr+10),
-
-		.currentframe = -1,
 	};
 
 	if (img->flags & FLAG_OVERWRITE)
@@ -101,6 +93,12 @@ static struct lbx_image_priv *lbx_img_init(unsigned char hdr[static HDR_LEN])
 	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;
 }
 
@@ -132,7 +130,6 @@ struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
 	 */
 	_lbx_assert(img->wtf  == 0); /* version? */
 	_lbx_assert(img->wtf2 == 0); /* very likely is simply reserved. */
-	_lbx_assert(img->pub.frames > img->pub.leadin);
 	_lbx_assert(!(img->flags & ~FLAG_ALL));
 
 	/* Read all offsets.  Should be merged with identical code in lbx.c */
@@ -149,27 +146,6 @@ struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
 		img->offsets[i] = unpack_32_le(buf);
 	}
 
-	if (img->flags & FLAG_PALETTE) {
-		unsigned char buf[4];
-
-		if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-			if (fops->eof(f))
-				lbx_error_raise(LBX_EEOF);
-			free(img);
-			return NULL;
-		}
-
-		img->palstart = unpack_16_le(buf+0);
-		img->palcount = unpack_16_le(buf+2);
-		img->paloff   = fops->tell(f);
-
-		if (img->palstart + img->palcount > 256) {
-			lbx_error_raise(LBX_EFORMAT);
-			free(img);
-			return NULL;
-		}
-	}
-
 	return &img->pub;
 }
 
@@ -213,64 +189,6 @@ struct lbx_image *lbx_img_fopen(const char *file)
 	return lbx_img_open(p, &lbx_pipe_fops, pipe_close);
 }
 
-static int _lbx_drawrow(struct lbx_image_priv *img)
-{
-	unsigned char *pos;
-	unsigned x, y;
-	long rc;
-
-	assert(img->framedata);
-	assert(img->mask);
-
-	rc = lbx_img_read_row_header(&img->pub, &x, &y);
-	if (rc == 0)
-		return 1;
-	else if (rc < 0)
-		return -1;
-
-	pos = &img->framedata[y][x];
-	rc = lbx_img_read_row_data(&img->pub, pos);
-	if (rc < 0)
-		return -1;
-	memset(&img->mask[y][x], 1, rc);
-
-	return 0;
-}
-
-static unsigned char **allocframebuffer(size_t width, size_t height)
-{
-	unsigned char **new, *tmp;
-	size_t i;
-
-	if (height > SIZE_MAX / sizeof *new) {
-		lbx_error_raise(LBX_ENOMEM);
-		return NULL;
-	}
-
-	/* Ensure that there is at least one row in the framebuffer. */
-	if (height == 0 || width == 0)
-		width = height = 1;
-
-	tmp = calloc(height, width);
-	if (!tmp) {
-		lbx_error_raise(LBX_ENOMEM);
-		return NULL;
-	}
-
-	new = malloc(height * sizeof *new);
-	if (!new) {
-		lbx_error_raise(LBX_ENOMEM);
-		free(tmp);
-		return NULL;
-	}
-
-	for (i = 0; i < height; i++) {
-		new[i] = tmp + i * width;
-	}
-
-	return new;
-}
-
 int lbx_img_seek(struct lbx_image *pub, unsigned frame)
 {
 	struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
@@ -409,123 +327,29 @@ long lbx_img_read_row_data(struct lbx_image *pub, void *buf)
 	return img->currentn;
 }
 
-static unsigned char **read_raw_frame(struct lbx_image_priv *img, int frame)
-{
-	unsigned long size = img->pub.width * img->pub.height;
-	int rc;
-
-	assert(img->flags & FLAG_RAW);
-
-	rc = lbx_img_seek(&img->pub, frame);
-	if (rc < 0)
-		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 *pub, int frame)
+static int read_palette(void *f, const struct lbx_file_ops *fops,
+                        struct lbx_colour *palette, unsigned count,
+			bool external)
 {
-	struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
-	unsigned char buf[4];
-
-	if (frame >= pub->frames || frame < 0) {
-		lbx_error_raise(LBX_EINVAL);
-		return NULL;
-	}
-
-	if (!img->framedata) {
-		img->framedata = allocframebuffer(pub->width, pub->height);
-		if (!img->framedata)
-			return NULL;
-	}
-
-	if (!img->mask) {
-		img->mask = allocframebuffer(pub->width, pub->height);
-		if (!img->mask)
-			return NULL;
-	}
-
-	if (img->flags & FLAG_RAW)
-		return read_raw_frame(img, frame);
-
-	if ((img->flags & FLAG_OVERWRITE)
-	     || (pub->chunk && !(frame % pub->chunk))) {
-		/* Clear the slate. */
-		img->currentframe = -1;
-		memset(img->framedata[0], 0, pub->width * pub->height);
-		memset(img->mask[0],      0, pub->width * pub->height);
-	} else {
-		/* Start over if we are backtracking. */
-		if (img->currentframe > frame) {
-			memset(img->mask[0], 0, pub->width * pub->height);
-			img->currentframe = -1;
-		}
-
-		/* We must have previous frame decoded to continue. */
-		if (frame > img->currentframe + 1) {
-			if (!lbx_img_getframe(pub, frame-1))
-				return NULL;
-		}
-	}
-
-	if (img->currentframe != frame) {
-		int rc;
-
-		rc = lbx_img_seek(pub, frame);
-		if (rc < 0)
-			return NULL;
-
-		do {
-			rc = _lbx_drawrow(img);
-			if (rc == -1)
-				return NULL;
-
-			if (img->fops->tell(img->f) > img->offsets[frame+1]) {
-				lbx_error_raise(LBX_EFORMAT);
-				return NULL;
-			}
-		} while (!rc);
-	}
-
-	img->currentframe = frame;
-	return img->framedata;
-}
-
-int
-lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
-                    struct lbx_colour palette[static 256])
-{
-	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 (fops->read(entry, sizeof entry, f) != sizeof entry) {
+		if (fops->read(buf, 4, f) != 4) {
 			if (fops->eof(f))
 				lbx_error_raise(LBX_EEOF);
 			return -1;
 		}
 
-		if (entry[0] != 1) {
+		if (buf[0] != external) {
 			lbx_error_raise(LBX_EFORMAT);
 			return -1;
 		}
 
 		palette[i] = (struct lbx_colour) {
-			.red    = entry[1] & 0x3f,
-			.green  = entry[2] & 0x3f,
-			.blue   = entry[3] & 0x3f,
+			.red    = buf[1] & 0x3f,
+			.green  = buf[2] & 0x3f,
+			.blue   = buf[3] & 0x3f,
 			.active = 1,
 		};
 	}
@@ -533,95 +357,63 @@ lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
 	return 0;
 }
 
-int
-lbx_img_getpalette(struct lbx_image *pub, struct lbx_colour palette[static 256])
+int lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
+                        struct lbx_colour *palette)
+{
+	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 char entry[4];
-	unsigned int i;
-	size_t rc;
+	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 (img->fops->seek(img->f, img->paloff, SEEK_SET)) {
+	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 = img->fops->read(entry, sizeof entry, img->f);
-		if (rc < sizeof entry) {
-			goto readerr;
-		}
+	/* Read embedded palette header */
+	if (img->fops->read(buf, 4, img->f) < 4)
+		goto readerr;
 
-		if (entry[0] != 0) {
-			lbx_error_raise(LBX_EFORMAT);
-			return -1;
-		}
+	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;
+	}
 
-		palette[img->palstart + i] = (struct lbx_colour){
-			.red    = entry[1],
-			.green  = entry[2],
-			.blue   = entry[3],
-			.active = 1,
-		};
+	if (out) {
+		rc = read_palette(img->f, img->fops,
+		                  out+palette_start, palette_count,
+		                  false);
+		if (rc < 0)
+			return -1;
 	}
 
-	return 0;
+	return palette_count;
 readerr:
 	if (img->fops->eof(img->f))
 		lbx_error_raise(LBX_EEOF);
 	return -1;
 }
 
-void lbx_img_getinfo(struct lbx_image *pub, struct lbx_imginfo *info)
-{
-	struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
-
-	*info = (struct lbx_imginfo) {
-		.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->pub.leadin != pub->frames - 1) {
-		info->loopstart = img->pub.leadin;
-		info->looping   = 1;
-	}
-}
-
-unsigned char **lbx_img_getmask(struct lbx_image *pub)
-{
-	struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
-
-	return img->mask;
-}
-
 int lbx_img_close(struct lbx_image *pub)
 {
 	struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
 	int rc = 0;
 
-	if (img) {
-		if (img->framedata) {
-			free(img->framedata[0]);
-			free(img->framedata);
-		}
-
-		if (img->mask) {
-			free(img->mask[0]);
-			free(img->mask);
-		}
-
-		if (img && img->dtor) {
-			rc = img->dtor(img->f);
-		}
-
-		free(img);
+	if (img && img->dtor) {
+		rc = img->dtor(img->f);
 	}
+	free(img);
 
 	return rc;
 }