liblbx: Kill the old LBX image API.

[liblbx.git] / src / image.h

diff --git a/src/image.h b/src/image.h
index b51b3600dea242e92676c949fab04bc2ef7d0e9e..10bd71802653542a1f361d79624359a82296675d 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -7,14 +7,11 @@ 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 {
@@ -27,8 +24,9 @@ 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_loadpalette(void *f, const struct lbx_file_ops *fops,
                        struct lbx_colour palette[static 256]);