X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/38a465378241d4c74b07fd7e4deaf2af09ff2bcb..e58493762dbd70870b7bdc1fd9fc922485c91c2c:/src/image.h

diff --git a/src/image.h b/src/image.h
index b51b360..05d3660 100644
--- a/src/image.h
+++ b/src/image.h
@@ -7,19 +7,16 @@ struct lbx_file_ops;
 
 struct lbx_image {
 	unsigned short width, height;
-	unsigned char frames, chunk;
+	unsigned char frames, chunk, leadin;
 };
 
 struct lbx_colour {
-	unsigned char red;
-	unsigned char green;
-	unsigned char blue;
-	unsigned char active;
+	unsigned red:6, green:6, blue:6, active:1;
 };
 
 struct lbx_imginfo {
 	unsigned char loopstart;
-	int palettesz, looping;
+	int looping;
 };
 
 struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
@@ -27,13 +24,13 @@ struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
 struct lbx_image *lbx_img_fopen(const char *file);
 int     lbx_img_close(struct lbx_image *img);
 
-unsigned char **lbx_img_getframe(struct lbx_image *img, int frame);
-unsigned char **lbx_img_getmask(struct lbx_image *img);
+int lbx_img_seek(struct lbx_image *img, unsigned frame);
+long lbx_img_read_row_header(struct lbx_image *img, unsigned *x, unsigned *y);
+long lbx_img_read_row_data(struct lbx_image *img, void *buf);
 
+int lbx_img_getpalette(struct lbx_image *img, struct lbx_colour *palette);
 int lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
-                       struct lbx_colour palette[static 256]);
-int lbx_img_getpalette(struct lbx_image *img,
-                       struct lbx_colour palette[static 256]);
+                        struct lbx_colour *palette);
 
 void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info);