-LBX_IMG *lbximg_fopen(FILE *f);
-void 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);
+
+unsigned char **lbx_img_getframe(struct lbx_image *img, int frame);
+unsigned char **lbx_img_getmask(struct lbx_image *img);