liblbx: Add support for "chunked" images.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 4b664b70d1876916f3029ba5f8636038b484e06b..933e1e079abef22c84b709f12539448ecc0a50ae 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -176,12 +176,19 @@ int outpng(unsigned int frameno,
                 * data to libpng and let it do its magic.
                 */
 
+               png_color png_palette[256];
+               for (unsigned i = 0; i < 256; i++) {
+                       png_palette[i].red   = palette[i].red;
+                       png_palette[i].green = palette[i].green;
+                       png_palette[i].blue  = palette[i].blue;
+               }
+
                png_set_IHDR(png, info, width, height, 8,
                             PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
                             PNG_COMPRESSION_TYPE_DEFAULT,
                             PNG_FILTER_TYPE_DEFAULT);
                
-               png_set_PLTE(png, info, (png_colorp)palette, 256);
+               png_set_PLTE(png, info, png_palette, 256);
                png_set_rows(png, info, framedata);
                png_write_png(png, info, PNG_TRANSFORM_IDENTITY, NULL);
        } else {
@@ -281,7 +288,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;
        }
@@ -461,6 +468,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" : "");
        }