X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/0eb74c284927b79b607adceae7262734e81a46b3..fa7c556d251ebcb41ef9709b4d85a2c820dee94b:/src/lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index d52f688..e5e3d07 100644
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -29,6 +29,7 @@
 
 #include "tools.h"
 #include "image.h"
+#include "error.h"
 #include "lbx.h"
 
 /* Global flags */
@@ -238,7 +239,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 	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;
 	}
@@ -287,13 +288,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) {
-		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;
 	}
 
@@ -344,7 +345,7 @@ int decode(LBXimg *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;
 		}
 
@@ -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;
 	}