X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/44d94e72539dd1fba3d4ec2772792b04e6c078d4..38a465378241d4c74b07fd7e4deaf2af09ff2bcb:/src/image.h?ds=sidebyside

diff --git a/src/image.h b/src/image.h
index 0d5b111..b51b360 100644
--- 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;
@@ -14,23 +18,23 @@ struct lbx_colour {
 };
 
 struct lbx_imginfo {
-	unsigned short width, height;
-	unsigned char  nframes, loopstart, chunk;
+	unsigned char loopstart;
 	int palettesz, looping;
 };
 
-LBXimg *lbximg_open(void *f, const struct lbx_file_ops *fops,
-                     int (*destructor)(void *));
-LBXimg *lbximg_fopen(const char *file);
-int     lbximg_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 **lbximg_getframe(LBXimg *img, int frame);
-unsigned char **lbximg_getmask(LBXimg *img);
+unsigned char **lbx_img_getframe(struct lbx_image *img, int frame);
+unsigned char **lbx_img_getmask(struct lbx_image *img);
 
-int lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
+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]);
-int lbximg_getpalette(LBXimg *img, struct lbx_colour palette[static 256]);
 
-void lbximg_getinfo(LBXimg *img, struct lbx_imginfo *info);
+void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info);
 
 #endif