liblbx: Use unconditional includes of <config.h>.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 6bdbaae172a7b4838d0dd80343f3c98b0844c58f..e5e3d07903387c401158a67499a1243aee335cda 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Simple command-line tool to convert an LBX image to a set of PNGs.
- *  Copyright (C) 2006-2008 Nick Bowler
+ *  Copyright (C) 2006-2010 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include "tools.h"
 #include "image.h"
+#include "error.h"
 #include "lbx.h"
 
 /* Global flags */
@@ -234,11 +235,11 @@ 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) {
-               errmsg("failed to open override image: %s\n", lbx_strerror());
+               errmsg("failed to open override image: %s\n", lbx_errmsg());
                return -1;
        }
        lbximg_getinfo(overimg, &info);
@@ -250,7 +251,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
        }
 
        if (lbximg_getpalette(overimg, palette) == -1) {
-               errmsg("error reading override palette: %s\n", lbx_strerror());
+               errmsg("error reading override palette: %s\n", lbx_errmsg());
                lbximg_close(overimg);
                return -1;
        }
@@ -259,7 +260,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])
 {
@@ -287,13 +288,13 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
 
        /* Read the external palette, if any. */
        if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
-               errmsg("error reading external palette: %s\n", lbx_strerror());
+               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) {
-               errmsg("error reading embedded palette: %s\n", lbx_strerror());
+               errmsg("error reading embedded palette: %s\n", lbx_errmsg());
                return -1;
        }
 
@@ -305,7 +306,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];
@@ -344,7 +345,7 @@ int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
 
                data = lbximg_getframe(img, i);
                if (!data) {
-                       errmsg("error in frame %u: %s\n", i, lbx_strerror());
+                       errmsg("error in frame %u: %s\n", i, lbx_errmsg());
                        continue;
                }
 
@@ -373,7 +374,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[] = {
@@ -452,7 +453,7 @@ int main(int argc, char **argv)
                img = lbximg_open(&stdin_handle, &lbx_pipe_fops, NULL);
 
        if (!img) {
-               errmsg("failed to open image: %s.\n", lbx_strerror());
+               errmsg("failed to open image: %s.\n", lbx_errmsg());
                return EXIT_FAILURE;
        }