liblbx: Namespace cleanup.

[liblbx.git] / src / image.c

diff --git a/src/image.c b/src/image.c
index cc8d54bf290cd44bf237048bb44e3096b57af0b5..4a0fdd88080be4d68d9ad3ac8e7cc0235568cefe 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -16,10 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -28,6 +25,7 @@
 #include "pack.h"
 #include "misc.h"
 #include "lbx.h"
+#include "error.h"
 #include "image.h"
 
 #define FLAG_RAW       0x0100 /* Image is stored as a flat array of bytes. */
@@ -60,14 +58,14 @@ 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;
 
        img = malloc(sizeof *img + sizeof img->offsets[0] * (nframes+1));
        if (!img) {
-               lbx_errno = -errno;
+               lbx_error_raise(LBX_ENOMEM);
                return NULL;
        }
 
@@ -87,20 +85,19 @@ 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;
 
        if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
-               lbx_errno = -errno;
                if (fops->eof(f))
-                       lbx_errno = LBX_EEOF;
+                       lbx_error_raise(LBX_EEOF);
                return NULL;
        }
 
-       img = lbximg_init(hdr_buf);
+       img = lbx_img_init(hdr_buf);
        if (!img)
                return NULL;
 
@@ -124,9 +121,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
                unsigned char buf[4];
 
                if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-                       lbx_errno = -errno;
                        if (fops->eof(f))
-                               lbx_errno = LBX_EEOF;
+                               lbx_error_raise(LBX_EEOF);
                        free(img);
                        return NULL;
                }
@@ -138,9 +134,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
                unsigned char buf[4];
 
                if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-                       lbx_errno = -errno;
                        if (fops->eof(f))
-                               lbx_errno = LBX_EEOF;
+                               lbx_error_raise(LBX_EEOF);
                        free(img);
                        return NULL;
                }
@@ -150,7 +145,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
                img->paloff   = fops->tell(f);
 
                if (img->palstart + img->palcount > 256) {
-                       lbx_errno = LBX_EFORMAT;
+                       lbx_error_raise(LBX_EFORMAT);
                        free(img);
                        return NULL;
                }
@@ -174,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;
@@ -184,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) {
@@ -193,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)
@@ -231,7 +226,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 
                /* Ensure that the row fits in the image. */
                if (img->height - img->currenty <= yval || xval >= img->width) {
-                       lbx_errno = LBX_EFORMAT;
+                       lbx_error_raise(LBX_EFORMAT);
                        return -1;
                }
 
@@ -241,7 +236,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
                xval = unpack_16_le(buf+2);
 
                if (img->width - img->currentx <= xval) {
-                       lbx_errno = LBX_EFORMAT;
+                       lbx_error_raise(LBX_EFORMAT);
                        return -1;
                }
                img->currentx += xval;
@@ -250,7 +245,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
        }
 
        if (count > img->width - img->currentx) {
-               lbx_errno = LBX_EFORMAT;
+               lbx_error_raise(LBX_EFORMAT);
                return -1;
        }
 
@@ -270,9 +265,8 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 
        return 0;
 readerr:
-       lbx_errno = -errno;
        if (img->fops->eof(img->f))
-               lbx_errno = LBX_EEOF;
+               lbx_error_raise(LBX_EEOF);
        return -1;
 }
 
@@ -283,13 +277,13 @@ static unsigned char **allocframebuffer(size_t width, size_t height)
 
        tmp = calloc(height, width);
        if (!tmp) {
-               lbx_errno = -errno;
+               lbx_error_raise(LBX_ENOMEM);
                return NULL;
        }
 
        new = malloc(height * sizeof *new);
        if (!new) {
-               lbx_errno = -errno;
+               lbx_error_raise(LBX_ENOMEM);
                free(tmp);
                return NULL;
        }
@@ -308,30 +302,28 @@ static unsigned char **read_raw_frame(struct lbx_image *img, int frame)
        assert(img->flags & FLAG_RAW);
 
        if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
-               lbx_errno = -errno;
                return NULL;
        }
 
        if (img->fops->read(img->framedata[0], size, img->f) != size) {
-               lbx_errno = -errno;
                if (img->fops->eof(img->f))
-                       lbx_errno = LBX_EEOF;
+                       lbx_error_raise(LBX_EEOF);
                return NULL;
        }
        memset(img->mask[0], 1, size);
 
        if (img->fops->tell(img->f) > img->offsets[frame+1]) {
-               lbx_errno = LBX_EFORMAT;
+               lbx_error_raise(LBX_EFORMAT);
                return NULL;
        }
 
        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_errno = LBX_ERANGE;
+               lbx_error_raise(LBX_ENOENT);
                return NULL;
        }
 
@@ -365,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;
                }
        }
@@ -374,7 +366,6 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
                int rc, first = 1;
 
                if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
-                       lbx_errno = -errno;
                        return NULL;
                }
 
@@ -385,7 +376,7 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
                        first = 0;
 
                        if (img->fops->tell(img->f) > img->offsets[frame+1]) {
-                               lbx_errno = LBX_EFORMAT;
+                               lbx_error_raise(LBX_EFORMAT);
                                return NULL;
                        }
                } while (!rc);
@@ -396,20 +387,21 @@ 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;
 
        for (i = 0; i < 256; i++) {
                if (fops->read(entry, sizeof entry, f) != sizeof entry) {
-                       lbx_errno = (feof(f)) ? LBX_EEOF : -errno;
+                       if (fops->eof(f))
+                               lbx_error_raise(LBX_EEOF);
                        return -1;
                }
 
                if (entry[0] != 1) {
-                       lbx_errno = LBX_EFORMAT;
+                       lbx_error_raise(LBX_EFORMAT);
                        return -1;
                }
 
@@ -425,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;
@@ -436,7 +428,6 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
                return 0;
 
        if (img->fops->seek(img->f, img->paloff, SEEK_SET)) {
-               lbx_errno = -errno;
                return -1;
        }
 
@@ -447,7 +438,7 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
                }
 
                if (entry[0] != 0) {
-                       lbx_errno = LBX_EFORMAT;
+                       lbx_error_raise(LBX_EFORMAT);
                        return -1;
                }
 
@@ -461,11 +452,12 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 
        return 0;
 readerr:
-       lbx_errno = img->fops->eof(img->f) ? LBX_EEOF : -errno;
+       if (img->fops->eof(img->f))
+               lbx_error_raise(LBX_EEOF);
        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,
@@ -485,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;