liblbx: Rename LBX_IMG to LBXimg.

This makes it consistent with LBXfile.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 2ce714f416034033d2c0f4ea29abe772b8edfe64..429e59f42876afbe5dd748289ee1e7c633d81929 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -37,7 +37,7 @@ static GtkBuilder *builder;
 static GtkWidget *canvas;
 static GdkGC     *bg_gc;
 
-static LBX_IMG *image;
+static LBXimg *image;
 
 static GdkPixbuf *framebuf;
 
@@ -150,7 +150,7 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
        return TRUE;
 }
 
-static int alloc_framebuffer(LBX_IMG *image)
+static int alloc_framebuffer(LBXimg *image)
 {
        struct lbx_imginfo info;
        GtkSpinButton *spin;
@@ -177,11 +177,10 @@ static int close_image(void *handle)
        return 0;
 }
 
-static LBX_IMG *
-load_lbx_image(LBX *archive, unsigned index)
+static LBXimg *load_lbx_image(LBX *archive, unsigned index)
 {
        LBXfile *file;
-       LBX_IMG *image;
+       LBXimg *image;
 
        file = lbx_file_open(archive, index);
        g_return_val_if_fail(file, NULL);
@@ -197,7 +196,7 @@ void set_override(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBX_IMG *img;
+       LBXimg *img;
 
        memset(palette_override, 0, sizeof palette_override);
        if (!gtk_combo_box_get_active_iter(combo, &iter))
@@ -247,7 +246,7 @@ void set_image(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBX_IMG *img;
+       LBXimg *img;
 
        if (image) {
                lbximg_close(image);

diff --git a/src/gui/render.c b/src/gui/render.c
index 9dd4e9bbcb41b99639c1615d1145d6d59781d93b..8e706870533391975d26d116c3ddca392833ff16 100644 (file)
--- a/src/gui/render.c
+++ b/src/gui/render.c
@@ -46,7 +46,7 @@ static void get_colour(unsigned char index, unsigned char out[static 4])
        out[3] = -1; /* opaque */
 }
 
-int render_to_pixbuf(LBX_IMG *image, GdkPixbuf *pixbuf, unsigned frame)
+int render_to_pixbuf(LBXimg *image, GdkPixbuf *pixbuf, unsigned frame)
 {
        unsigned char **framedata, **framemask, *outbuf;
        struct lbx_imginfo info;

diff --git a/src/gui/render.h b/src/gui/render.h
index c4f793eb88264bfee9cfb548d3a88513ed42e8c6..3ebd0d22553fa13ae61b73ebe8be9dbc284bf7fd 100644 (file)
--- a/src/gui/render.h
+++ b/src/gui/render.h
@@ -7,6 +7,6 @@ extern struct lbx_colour palette_external[256];
 extern struct lbx_colour palette_internal[256];
 extern struct lbx_colour palette_override[256];
 
-int render_to_pixbuf(LBX_IMG *image, GdkPixbuf *pixbuf, unsigned frame);
+int render_to_pixbuf(LBXimg *image, GdkPixbuf *pixbuf, unsigned frame);
 
 #endif

diff --git a/src/image.h b/src/image.h
index c1ca3ba25b54738596b82418b0c0331337501cbd..0d5b111c6cc720ee04e47b545f26488d444ae8ee 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-typedef struct lbx_image LBX_IMG;
+typedef struct lbx_image LBXimg;
 struct lbx_file_ops;
 
 struct lbx_colour {
@@ -19,18 +19,18 @@ struct lbx_imginfo {
        int palettesz, looping;
 };
 
-LBX_IMG *lbximg_open(void *f, const struct lbx_file_ops *fops,
+LBXimg *lbximg_open(void *f, const struct lbx_file_ops *fops,
                      int (*destructor)(void *));
-LBX_IMG *lbximg_fopen(const char *file);
-int      lbximg_close(LBX_IMG *img);
+LBXimg *lbximg_fopen(const char *file);
+int     lbximg_close(LBXimg *img);
 
-unsigned char **lbximg_getframe(LBX_IMG *img, int frame);
-unsigned char **lbximg_getmask(LBX_IMG *img);
+unsigned char **lbximg_getframe(LBXimg *img, int frame);
+unsigned char **lbximg_getmask(LBXimg *img);
 
 int lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
                        struct lbx_colour palette[static 256]);
-int lbximg_getpalette(LBX_IMG *img, struct lbx_colour palette[static 256]);
+int lbximg_getpalette(LBXimg *img, struct lbx_colour palette[static 256]);
 
-void lbximg_getinfo(LBX_IMG *img, struct lbx_imginfo *info);
+void lbximg_getinfo(LBXimg *img, struct lbx_imginfo *info);
 
 #endif

diff --git a/src/lbximg.c b/src/lbximg.c
index a8a5df3cb81cc7008551bb7aa317e03e12ca1eea..d52f68840f5effee60652a2f3396f6287d288849 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -234,7 +234,7 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-       LBX_IMG *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+       LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
        struct lbx_imginfo info;
 
        if (!overimg) {
@@ -259,7 +259,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
        return 0;
 }
 
-static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
+static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
                        FILE *palf, FILE *override,
                        struct lbx_colour palette[static 256])
 {
@@ -305,7 +305,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
        return 0;
 }
 
-int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
+int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 {
        unsigned char *framebits;
        struct lbx_colour palette[256];
@@ -373,7 +373,7 @@ int main(int argc, char **argv)
        struct lbx_pipe_state stdin_handle = { .f = stdin };
        FILE *palf = NULL, *overf = NULL;
        const char *file = NULL;
-       LBX_IMG *img;
+       LBXimg *img;
 
        static const char *sopts = "idnvf:p:O:V";
        static const struct option lopts[] = {