liblbx: Namespace cleanup.

diff --git a/src/Makefile.inc b/src/Makefile.inc
index c033f5376cb20ad3c0398fa46bbb6ff1fdf5b775..1bd16f3c8ba9b06f0a04b3943528f484d63cac79 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -11,6 +11,7 @@ noinst_HEADERS += src/misc.h src/tools.h src/pack.h
 
 lib_LTLIBRARIES  += liblbx.la
 liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/pack.c src/error.c
+liblbx_la_LDFLAGS = -export-symbols-regex '^lbx_'
 
 bin_PROGRAMS    += lbxtool
 lbxtool_SOURCES  = src/lbxtool.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 9e462e65dd5c7df7eecc021111b267b4f7d9c86f..7eed44f6c825114e6c4bbfe426f256de24fcbd87 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -88,7 +88,7 @@ static void tick(void *p, double delta)
        if (!image)
                return;
 
-       lbximg_getinfo(image, &info);
+       lbx_img_getinfo(image, &info);
        spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin"));
        play = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "playbutton"));
 
@@ -160,7 +160,7 @@ static int alloc_framebuffer(LBXimg *image)
        if (framebuf)
                g_object_unref(framebuf);
 
-       lbximg_getinfo(image, &info);
+       lbx_img_getinfo(image, &info);
        framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
                info.width, info.height);
        g_return_val_if_fail(framebuf, -1);
@@ -187,7 +187,7 @@ static LBXimg *load_lbx_image(LBX *archive, unsigned index)
        file = lbx_file_open(archive, index);
        g_return_val_if_fail(file, NULL);
 
-       image = lbximg_open(file, &lbx_arch_fops, close_image);
+       image = lbx_img_open(file, &lbx_arch_fops, close_image);
        if (!image)
                lbx_file_close(file);
        return image;
@@ -211,8 +211,8 @@ void set_override(GtkComboBox *combo)
 
        img = load_lbx_image(lbx, index);
        if (img) {
-               lbximg_getpalette(img, palette_override);
-               lbximg_close(img);
+               lbx_img_getpalette(img, palette_override);
+               lbx_img_close(img);
                redraw_image();
        }
 }
@@ -235,7 +235,7 @@ void set_palette(GtkComboBox *combo)
 
        f = lbx_file_open(lbx, index);
        if (f) {
-               if (lbximg_loadpalette(f, &lbx_arch_fops, palette_external))
+               if (lbx_img_loadpalette(f, &lbx_arch_fops, palette_external))
                        memset(palette_external, 0, sizeof palette_external);
                lbx_file_close(f);
        }
@@ -251,7 +251,7 @@ void set_image(GtkComboBox *combo)
        LBXimg *img;
 
        if (image) {
-               lbximg_close(image);
+               lbx_img_close(image);
                image = NULL;
        }
 
@@ -267,14 +267,14 @@ void set_image(GtkComboBox *combo)
 
        img = load_lbx_image(lbx, index);
        if (img) {
-               if (lbximg_getpalette(img, palette_internal) == -1) {
+               if (lbx_img_getpalette(img, palette_internal) == -1) {
                        puts("crap");
-                       lbximg_close(img);
+                       lbx_img_close(img);
                }
 
                if (alloc_framebuffer(img) == -1) {
                        puts("crap");
-                       lbximg_close(img);
+                       lbx_img_close(img);
                }
        }
 

diff --git a/src/gui/render.c b/src/gui/render.c
index 8e706870533391975d26d116c3ddca392833ff16..584cfd2caf3e1ee2985cd86ef4fe173af717eec9 100644 (file)
--- a/src/gui/render.c
+++ b/src/gui/render.c
@@ -52,13 +52,13 @@ int render_to_pixbuf(LBXimg *image, GdkPixbuf *pixbuf, unsigned frame)
        struct lbx_imginfo info;
        unsigned stride;
 
-       lbximg_getinfo(image, &info);
+       lbx_img_getinfo(image, &info);
        assert(info.width  == gdk_pixbuf_get_width(pixbuf));
        assert(info.height == gdk_pixbuf_get_height(pixbuf));
 
-       framedata = lbximg_getframe(image, frame);
+       framedata = lbx_img_getframe(image, frame);
        g_return_val_if_fail(framedata, -1);
-       framemask = lbximg_getmask(image);
+       framemask = lbx_img_getmask(image);
 
        outbuf = gdk_pixbuf_get_pixels(pixbuf);
        stride = gdk_pixbuf_get_rowstride(pixbuf);

diff --git a/src/image.c b/src/image.c
index 1525fb2d51fe684e170ea807c2dbd79148fde805..4a0fdd88080be4d68d9ad3ac8e7cc0235568cefe 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -58,7 +58,7 @@ struct lbx_image {
        unsigned long offsets[];
 };
 
-static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
+static struct lbx_image *lbx_img_init(unsigned char hdr[static HDR_LEN])
 {
        unsigned short nframes = unpack_16_le(hdr+6);
        struct lbx_image *img;
@@ -85,8 +85,8 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
        return img;
 }
 
-struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
-                              int (*destructor)(void *))
+struct lbx_image *lbx_img_open(void *f, const struct lbx_file_ops *fops,
+                               int (*destructor)(void *))
 {
        unsigned char hdr_buf[HDR_LEN];
        struct lbx_image *img;
@@ -97,7 +97,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
                return NULL;
        }
 
-       img = lbximg_init(hdr_buf);
+       img = lbx_img_init(hdr_buf);
        if (!img)
                return NULL;
 
@@ -169,7 +169,7 @@ static int file_close(void *f)
        return fclose((FILE *)f);
 }
 
-struct lbx_image *lbximg_fopen(const char *file)
+struct lbx_image *lbx_img_fopen(const char *file)
 {
        struct lbx_pipe_state *p;
        FILE *f;
@@ -179,7 +179,7 @@ struct lbx_image *lbximg_fopen(const char *file)
                return NULL;
 
        if (fseek(f, 0, SEEK_CUR) == 0)
-               return lbximg_open(f, &lbx_default_fops, file_close);
+               return lbx_img_open(f, &lbx_default_fops, file_close);
 
        p = malloc(sizeof *p);
        if (!p) {
@@ -188,7 +188,7 @@ struct lbx_image *lbximg_fopen(const char *file)
        }
 
        *p = (struct lbx_pipe_state) { .f = f };
-       return lbximg_open(p, &lbx_pipe_fops, pipe_close);
+       return lbx_img_open(p, &lbx_pipe_fops, pipe_close);
 }
 
 static int _lbx_drawrow(int first, struct lbx_image *img)
@@ -320,7 +320,7 @@ static unsigned char **read_raw_frame(struct lbx_image *img, int frame)
        return img->framedata;
 }
 
-unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
+unsigned char **lbx_img_getframe(struct lbx_image *img, int frame)
 {
        if (frame >= img->frames || frame < 0) {
                lbx_error_raise(LBX_ENOENT);
@@ -357,7 +357,7 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 
                /* We must have previous frame decoded to continue. */
                if (frame > img->currentframe + 1) {
-                       if (!lbximg_getframe(img, frame-1))
+                       if (!lbx_img_getframe(img, frame-1))
                                return NULL;
                }
        }
@@ -387,8 +387,8 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 }
 
 int
-lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
-                   struct lbx_colour palette[static 256])
+lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
+                    struct lbx_colour palette[static 256])
 {
        unsigned char entry[4];
        int i;
@@ -417,7 +417,7 @@ lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
 }
 
 int
-lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
+lbx_img_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 {
        unsigned char entry[4];
        unsigned int i;
@@ -457,7 +457,7 @@ readerr:
        return -1;
 }
 
-void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
+void lbx_img_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
 {
        *info = (struct lbx_imginfo) {
                .width      = img->width,
@@ -477,12 +477,12 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
        }
 }
 
-unsigned char **lbximg_getmask(struct lbx_image *img)
+unsigned char **lbx_img_getmask(struct lbx_image *img)
 {
        return img->mask;
 }
 
-int lbximg_close(struct lbx_image *img)
+int lbx_img_close(struct lbx_image *img)
 {
        int rc = 0;
 

diff --git a/src/image.h b/src/image.h
index 0d5b111c6cc720ee04e47b545f26488d444ae8ee..e0a52bb1c06c4e0f3969d03b48eec148bd97c8ce 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -19,18 +19,18 @@ struct lbx_imginfo {
        int palettesz, looping;
 };
 
-LBXimg *lbximg_open(void *f, const struct lbx_file_ops *fops,
+LBXimg *lbx_img_open(void *f, const struct lbx_file_ops *fops,
                      int (*destructor)(void *));
-LBXimg *lbximg_fopen(const char *file);
-int     lbximg_close(LBXimg *img);
+LBXimg *lbx_img_fopen(const char *file);
+int     lbx_img_close(LBXimg *img);
 
-unsigned char **lbximg_getframe(LBXimg *img, int frame);
-unsigned char **lbximg_getmask(LBXimg *img);
+unsigned char **lbx_img_getframe(LBXimg *img, int frame);
+unsigned char **lbx_img_getmask(LBXimg *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 lbximg_getpalette(LBXimg *img, struct lbx_colour palette[static 256]);
+int lbx_img_getpalette(LBXimg *img, struct lbx_colour palette[static 256]);
 
-void lbximg_getinfo(LBXimg *img, struct lbx_imginfo *info);
+void lbx_img_getinfo(LBXimg *img, struct lbx_imginfo *info);
 
 #endif

diff --git a/src/lbximg.c b/src/lbximg.c
index e5e3d07903387c401158a67499a1243aee335cda..fc12a73cb0fd57a9e6fb40f931a2069ca10ea180 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -235,28 +235,28 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-       LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+       LBXimg *overimg = lbx_img_open(f, &lbx_default_fops, NULL);
        struct lbx_imginfo info;
 
        if (!overimg) {
                errmsg("failed to open override image: %s\n", lbx_errmsg());
                return -1;
        }
-       lbximg_getinfo(overimg, &info);
+       lbx_img_getinfo(overimg, &info);
 
        if (!info.palettesz) {
                errmsg("override image has no palette.\n", 0);
-               lbximg_close(overimg);
+               lbx_img_close(overimg);
                return -1;
        }
 
-       if (lbximg_getpalette(overimg, palette) == -1) {
+       if (lbx_img_getpalette(overimg, palette) == -1) {
                errmsg("error reading override palette: %s\n", lbx_errmsg());
-               lbximg_close(overimg);
+               lbx_img_close(overimg);
                return -1;
        }
 
-       lbximg_close(overimg);
+       lbx_img_close(overimg);
        return 0;
 }
 
@@ -287,13 +287,13 @@ static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
        }
 
        /* Read the external palette, if any. */
-       if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
+       if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) {
                errmsg("error reading external palette: %s\n", lbx_errmsg());
                return -1;
        }
 
        /* Read the embedded palette, if any. */
-       if (info->palettesz && lbximg_getpalette(img, palette) == -1) {
+       if (info->palettesz && lbx_img_getpalette(img, palette) == -1) {
                errmsg("error reading embedded palette: %s\n", lbx_errmsg());
                return -1;
        }
@@ -314,7 +314,7 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
        int extracted = 0;
        unsigned int i;
 
-       lbximg_getinfo(img, &info);
+       lbx_img_getinfo(img, &info);
 
        framebits = calloc(1, info.nframes / CHAR_BIT + 1);
        if (!framebits) {
@@ -343,13 +343,13 @@ int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
                if (!(framebits[i / CHAR_BIT] & (1 << (i % CHAR_BIT))))
                        continue;
 
-               data = lbximg_getframe(img, i);
+               data = lbx_img_getframe(img, i);
                if (!data) {
                        errmsg("error in frame %u: %s\n", i, lbx_errmsg());
                        continue;
                }
 
-               mask = lbximg_getmask(img);
+               mask = lbx_img_getmask(img);
 
                if (!outpng(i, data, mask, info.width, info.height, palette)) {
                        extracted = 1;
@@ -448,9 +448,9 @@ int main(int argc, char **argv)
        }
 
        if (file)
-               img = lbximg_fopen(file);
+               img = lbx_img_fopen(file);
        else
-               img = lbximg_open(&stdin_handle, &lbx_pipe_fops, NULL);
+               img = lbx_img_open(&stdin_handle, &lbx_pipe_fops, NULL);
 
        if (!img) {
                errmsg("failed to open image: %s.\n", lbx_errmsg());
@@ -463,7 +463,7 @@ int main(int argc, char **argv)
                if (!file)
                        file = "stdin";
 
-               lbximg_getinfo(img, &info);
+               lbx_img_getinfo(img, &info);
                printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
                       file, info.width, info.height, info.nframes,
                       info.palettesz ? ", embedded palette" : "",
@@ -477,6 +477,6 @@ int main(int argc, char **argv)
                break;
        }
 
-       lbximg_close(img);
+       lbx_img_close(img);
        return rc;
 }