X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/fa7c556d251ebcb41ef9709b4d85a2c820dee94b..4e74df93acc6594cd8a212c30dc2b429520caef2:/src/image.c
diff --git a/src/image.c b/src/image.c
index a5a4bff..98d1a31 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,25 +1,22 @@
/*
- * 2ooM: The Master of Orion II Reverse Engineering Project
- * Library for working with LBX image files.
- * Copyright (C) 2006-2010 Nick Bowler
+ * 2ooM: The Master of Orion II Reverse Engineering Project
+ * Library for working with LBX image files.
+ * Copyright © 2006-2011, 2013 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
@@ -41,10 +38,11 @@
#define HDR_LEN 12
-struct lbx_image {
- unsigned short width, height;
+struct lbx_image_priv {
+ struct lbx_image pub;
+
unsigned short wtf, flags;
- unsigned char frames, wtf2, leadin, chunk;
+ unsigned char wtf2, leadin;
unsigned short palstart, palcount;
const struct lbx_file_ops *fops;
@@ -61,10 +59,10 @@ struct lbx_image {
unsigned long offsets[];
};
-static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
+static struct lbx_image_priv *lbx_img_init(unsigned char hdr[static HDR_LEN])
{
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) {
@@ -72,15 +70,15 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
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 = hdr[6],
- .wtf2 = hdr[7],
- .leadin = hdr[8],
- .chunk = hdr[9],
- .flags = unpack_16_le(hdr+10),
+ *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],
+ .leadin = hdr[8],
+ .pub.chunk = hdr[9],
+ .flags = unpack_16_le(hdr+10),
.currentframe = -1,
};
@@ -88,11 +86,11 @@ 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;
+ struct lbx_image_priv *img;
if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
if (fops->eof(f))
@@ -100,7 +98,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
return NULL;
}
- img = lbximg_init(hdr_buf);
+ img = lbx_img_init(hdr_buf);
if (!img)
return NULL;
@@ -116,11 +114,11 @@ struct lbx_image *lbximg_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->frames > img->leadin);
+ _lbx_assert(img->pub.frames > img->leadin);
_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 (fops->read(buf, sizeof buf, f) != sizeof buf) {
@@ -154,7 +152,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
}
}
- return img;
+ return &img->pub;
}
static int pipe_close(void *f)
@@ -172,29 +170,32 @@ static int file_close(void *f)
return fclose((FILE *)f);
}
-struct lbx_image *lbximg_fopen(const char *file)
+struct lbx_image *lbx_img_fopen(const char *file)
{
struct lbx_pipe_state *p;
FILE *f;
f = fopen(file, "rb");
- if (!f)
+ if (!f) {
+ lbx_error_raise(-errno);
return NULL;
+ }
if (fseek(f, 0, SEEK_CUR) == 0)
- return lbximg_open(f, &lbx_default_fops, file_close);
+ return lbx_img_open(f, &lbx_default_fops, file_close);
p = malloc(sizeof *p);
if (!p) {
+ lbx_error_raise(LBX_ENOMEM);
fclose(f);
return NULL;
}
*p = (struct lbx_pipe_state) { .f = f };
- return lbximg_open(p, &lbx_pipe_fops, pipe_close);
+ return lbx_img_open(p, &lbx_pipe_fops, pipe_close);
}
-static int _lbx_drawrow(int first, struct lbx_image *img)
+static int _lbx_drawrow(int first, struct lbx_image_priv *img)
{
unsigned short type, count, yval, xval;
unsigned char buf[4];
@@ -228,7 +229,8 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
return 1;
/* Ensure that the row fits in the image. */
- if (img->height - img->currenty <= yval || xval >= img->width) {
+ if (img->pub.height - img->currenty <= yval
+ || xval >= img->pub.width) {
lbx_error_raise(LBX_EFORMAT);
return -1;
}
@@ -238,7 +240,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
} else {
xval = unpack_16_le(buf+2);
- if (img->width - img->currentx <= xval) {
+ if (img->pub.width - img->currentx <= xval) {
lbx_error_raise(LBX_EFORMAT);
return -1;
}
@@ -247,7 +249,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
count = type;
}
- if (count > img->width - img->currentx) {
+ if (count > img->pub.width - img->currentx) {
lbx_error_raise(LBX_EFORMAT);
return -1;
}
@@ -298,9 +300,9 @@ static unsigned char **allocframebuffer(size_t width, size_t height)
return new;
}
-static unsigned char **read_raw_frame(struct lbx_image *img, int frame)
+static unsigned char **read_raw_frame(struct lbx_image_priv *img, int frame)
{
- unsigned long size = img->width * img->height;
+ unsigned long size = img->pub.width * img->pub.height;
assert(img->flags & FLAG_RAW);
@@ -323,21 +325,23 @@ static unsigned char **read_raw_frame(struct lbx_image *img, int frame)
return img->framedata;
}
-unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
+unsigned char **lbx_img_getframe(struct lbx_image *pub, int frame)
{
- if (frame >= img->frames || frame < 0) {
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
+
+ if (frame >= pub->frames || frame < 0) {
lbx_error_raise(LBX_ENOENT);
return NULL;
}
if (!img->framedata) {
- img->framedata = allocframebuffer(img->width, img->height);
+ img->framedata = allocframebuffer(pub->width, pub->height);
if (!img->framedata)
return NULL;
}
if (!img->mask) {
- img->mask = allocframebuffer(img->width, img->height);
+ img->mask = allocframebuffer(pub->width, pub->height);
if (!img->mask)
return NULL;
}
@@ -346,21 +350,21 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
return read_raw_frame(img, frame);
if ((img->flags & FLAG_OVERWRITE)
- || (img->chunk && !(frame % img->chunk))) {
+ || (pub->chunk && !(frame % pub->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);
+ 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, img->width * img->height);
+ 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 (!lbximg_getframe(img, frame-1))
+ if (!lbx_img_getframe(pub, frame-1))
return NULL;
}
}
@@ -390,8 +394,8 @@ 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;
@@ -409,9 +413,9 @@ lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
}
palette[i] = (struct lbx_colour) {
- .red = entry[1] << 2,
- .green = entry[2] << 2,
- .blue = entry[3] << 2,
+ .red = entry[1] & 0x3f,
+ .green = entry[2] & 0x3f,
+ .blue = entry[3] & 0x3f,
.active = 1,
};
}
@@ -420,8 +424,9 @@ 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 *pub, struct lbx_colour palette[static 256])
{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
unsigned char entry[4];
unsigned int i;
size_t rc;
@@ -446,9 +451,9 @@ 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],
+ .green = entry[2],
+ .blue = entry[3],
.active = 1,
};
}
@@ -460,13 +465,11 @@ readerr:
return -1;
}
-void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
+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) {
- .width = img->width,
- .height = img->height,
- .nframes = img->frames,
- .chunk = img->chunk,
.palettesz = (img->flags & FLAG_PALETTE) ? img->palcount : 0,
};
@@ -474,19 +477,22 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
if (img->flags & FLAG_LOOPING) {
info->loopstart = 0;
info->looping = 1;
- } else if (img->leadin != img->frames - 1) {
+ } else if (img->leadin != pub->frames - 1) {
info->loopstart = img->leadin;
info->looping = 1;
}
}
-unsigned char **lbximg_getmask(struct lbx_image *img)
+unsigned char **lbx_img_getmask(struct lbx_image *pub)
{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
+
return img->mask;
}
-int lbximg_close(struct lbx_image *img)
+int lbx_img_close(struct lbx_image *pub)
{
+ struct lbx_image_priv *img = (struct lbx_image_priv *)pub;
int rc = 0;
if (img) {