liblbx: Kill the LBXimg typedef.

[liblbx.git] / src / image.h

diff --git a/src/image.h b/src/image.h
index e0a52bb1c06c4e0f3969d03b48eec148bd97c8ce..2679babcc34ff40cbebf515252daa7f02dec5aa5 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -3,9 +3,13 @@
 
 #include <stdio.h>
 
-typedef struct lbx_image LBXimg;
 struct lbx_file_ops;
 
+struct lbx_image {
+       unsigned short width, height;
+       unsigned char frames, chunk;
+};
+
 struct lbx_colour {
        unsigned char red;
        unsigned char green;
@@ -19,18 +23,19 @@ struct lbx_imginfo {
        int palettesz, looping;
 };
 
-LBXimg *lbx_img_open(void *f, const struct lbx_file_ops *fops,
-                     int (*destructor)(void *));
-LBXimg *lbx_img_fopen(const char *file);
-int     lbx_img_close(LBXimg *img);
+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(LBXimg *img, int frame);
-unsigned char **lbx_img_getmask(LBXimg *img);
+unsigned char **lbx_img_getframe(struct lbx_image *img, int frame);
+unsigned char **lbx_img_getmask(struct lbx_image *img);
 
 int lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
                        struct lbx_colour palette[static 256]);
-int lbx_img_getpalette(LBXimg *img, struct lbx_colour palette[static 256]);
+int lbx_img_getpalette(struct lbx_image *img,
+                       struct lbx_colour palette[static 256]);
 
-void lbx_img_getinfo(LBXimg *img, struct lbx_imginfo *info);
+void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info);
 
 #endif