Trivial manual fixes.

[liblbx.git] / src / image.h

diff --git a/src/image.h b/src/image.h
index 5369e0aafbed4affb7ba4e0319664a0b3ee98f60..c375ce9ff51845b37761d53d08367003024da6df 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -3,33 +3,28 @@
 
 #include <stdio.h>
 
-typedef struct lbx_image LBX_IMG;
 struct lbx_file_ops;
 
-struct lbx_colour {
-       unsigned char red;
-       unsigned char green;
-       unsigned char blue;
+struct lbx_image {
+       unsigned short width, height;
+       unsigned char frames, chunk, leadin;
 };
 
-struct lbx_imginfo {
-       unsigned int width, height;
-       unsigned int nframes, loopstart;
-       int palettesz;
-       int looping;
+struct lbx_colour {
+       unsigned char red, green, blue, active;
 };
 
-LBX_IMG *lbximg_open(void *f, const struct lbx_file_ops *fops,
-                     int (*destructor)(void *));
-LBX_IMG *lbximg_fopen(FILE *f);
-int      lbximg_close(LBX_IMG *img);
-
-unsigned char **lbximg_getframe(LBX_IMG *img, int frame);
-unsigned char **lbximg_getmask(LBX_IMG *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);
 
-int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256]);
-int lbximg_getpalette(LBX_IMG *img, struct lbx_colour palette[static 256]);
+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);
 
-void lbximg_getinfo(LBX_IMG *img, struct lbx_imginfo *info);
+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);
 
 #endif