liblbx: Kill lbx_img_getinfo

[liblbx.git] / src / image.h

diff --git a/src/image.h b/src/image.h
index 2057a423e85d035b49e5a34faf5cdb6bd62f2a79..454b15b386c078561b9fc875e983c2c7a1b9744d 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -7,31 +7,24 @@ struct lbx_file_ops;
 
 struct lbx_image {
        unsigned short width, height;
-       unsigned char frames, chunk;
+       unsigned char frames, chunk, leadin;
 };
 
 struct lbx_colour {
        unsigned red:6, green:6, blue:6, active:1;
 };
 
-struct lbx_imginfo {
-       unsigned char loopstart;
-       int palettesz, looping;
-};
-
 struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
                                int (*destructor)(void *));
 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]);
-
-void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info);
+                        struct lbx_colour *palette);
 
 #endif