liblbx: Update lbximg_fopen to work like lbx_fopen.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 1cf765d3ad699ea2ac86b36b2c4c35037203379c..1173538856b94ae4781a78aedd86795d18719433 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -163,7 +163,6 @@ int outpng(unsigned int frameno,
        }
 
        if (setjmp(png_jmpbuf(png))) {
-               free(row);
                png_destroy_write_struct(&png, &info);
                goto err;
        }
@@ -221,12 +220,11 @@ int outpng(unsigned int frameno,
 
        png_destroy_write_struct(&png, &info);
        fclose(of);
+       free(row);
 
        if (verbose)
                printf("wrote %s\n", name);
-
        return 0;
-
 err:
        fclose(of);
        remove(name);
@@ -236,7 +234,7 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-       LBX_IMG *overimg = lbximg_fopen(f);
+       LBX_IMG *overimg = lbximg_open(f, &lbx_default_fops, NULL);
        struct lbx_imginfo info;
 
        if (!overimg) {
@@ -288,7 +286,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
        }
 
        /* Read the external palette, if any. */
-       if (palf && lbximg_loadpalette(palf, palette) == -1) {
+       if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
                errmsg("error reading external palette: %s\n", lbx_strerror());
                return -1;
        }
@@ -317,7 +315,7 @@ int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
 
        lbximg_getinfo(img, &info);
 
-       framebits = malloc(info.nframes / CHAR_BIT + 1);
+       framebits = calloc(1, info.nframes / CHAR_BIT + 1);
        if (!framebits) {
                return EXIT_FAILURE;
        }
@@ -468,6 +466,7 @@ int main(int argc, char **argv)
                printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
                       name, info.width, info.height, info.nframes,
                       info.palettesz ? ", embedded palette" : "",
+                      info.chunk     ? ", chunked" : "",
                       info.looping   ? ", loops" : "");
        }