Add the tools.h that should have been included a while ago.

[liblbx.git] / src / image.c

diff --git a/src/image.c b/src/image.c
index 15c725561d2b9c320bcaee2e95c8ca4dbf85e32e..fda9dfc7b04a585839142af0c4f6ad50405e4aac 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -40,9 +40,10 @@ struct lbx_image {
        uint16_t wtf1;
        uint16_t frames, leadin;
        uint16_t flags;
+       uint16_t palstart, palcount;
 
        FILE *f;
-       long foff;
+       long foff, paloff;
 
        int currentframe;
        int currentx, currenty;
@@ -71,12 +72,6 @@ struct lbx_image *lbximg_fopen(FILE *f)
        tmp.leadin = letohs(tmp.leadin); tmp.foff += sizeof tmp.leadin;
        tmp.flags  = letohs(tmp.flags);  tmp.foff += sizeof tmp.flags;
 
-       /* Format constraints. */
-       if (tmp.frames <= tmp.leadin) {
-               lbx_errno = LBX_EFORMAT;
-               return NULL;
-       }
-
        /*
         * DEBUG ONLY.  These assertions exist to catch otherwise valid image
         * files which differ from what I believe to be true of all LBX images.
@@ -84,6 +79,7 @@ struct lbx_image *lbximg_fopen(FILE *f)
         * assumptions.
         */
        _lbx_assert(tmp.wtf1 == 0);
+       _lbx_assert(tmp.frames > tmp.leadin); /* cmbtshp.lbx breaks this. */
        _lbx_assert(!(tmp.flags & ~(FLAG_PALETTE|FLAG_OVERWRITE|FLAG_LOOPING)));
 
        new = malloc(sizeof *new + (tmp.frames+1) * sizeof *new->offsets);
@@ -100,6 +96,24 @@ struct lbx_image *lbximg_fopen(FILE *f)
                goto readerr;
        new->foff += sizeof *new->offsets * (new->frames+1);
 
+       if (new->flags & FLAG_PALETTE) {
+               if (fread(&new->palstart, sizeof new->palstart, 1, f) != 1)
+                       goto readerr;
+               if (fread(&new->palcount, sizeof new->palcount, 1, f) != 1)
+                       goto readerr;
+
+               new->palstart = letohs(new->palstart);
+               new->palcount = letohs(new->palcount);
+               new->foff    += sizeof new->palstart + sizeof new->palcount;
+               new->paloff   = new->foff;
+
+               if (new->palstart + new->palcount > 256) {
+                       lbx_errno = LBX_EFORMAT;
+                       free(new);
+                       return NULL;
+               }
+       }
+
        return new;
 readerr:
        if (feof(f)) {
@@ -308,38 +322,19 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
 int
 lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 {
-       size_t hdrlen = 6*(sizeof img->wtf1)+(img->frames+1)*(sizeof *img->offsets);
        unsigned int i;
        size_t rc;
 
-       uint16_t start, count;
        uint8_t  entry[4];
 
        /* Do nothing if the image doesn't have embedded palette data. */
        if (!(img->flags & FLAG_PALETTE))
                return 0;
 
-       /* Palette data is located right after the header. */
-       if (_lbx_fseek(img->f, &img->foff, hdrlen) == -1)
+       if (_lbx_fseek(img->f, &img->foff, img->paloff) == -1)
                return -1;
        
-       /* Palette header */
-       if (fread(&start, sizeof start, 1, img->f) != 1) goto readerr;
-       if (fread(&count, sizeof count, 1, img->f) != 1) goto readerr;
-       start = letohs(start); img->foff += sizeof start;
-       count = letohs(count); img->foff += sizeof count;
-
-       if (start + count > 256) {
-               lbx_errno = LBX_EFORMAT;
-               return -1;
-       }
-
-       if (hdrlen + 2*sizeof start + count*sizeof entry > img->offsets[0]) {
-               lbx_errno = LBX_EFORMAT;
-               return -1;
-       }
-
-       for (i = 0; i < count; i++) {
+       for (i = 0; i < img->palcount; i++) {
                rc = fread(entry, 1, sizeof entry, img->f);
                img->foff += rc;
 
@@ -352,7 +347,7 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
                        return -1;
                }
 
-               palette[start + i] = (struct lbx_colour){
+               palette[img->palstart + i] = (struct lbx_colour){
                        .red   = entry[1] << 2,
                        .green = entry[2] << 2,
                        .blue  = entry[3] << 2,
@@ -371,7 +366,7 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
                .width      = img->width,
                .height     = img->height,
                .nframes    = img->frames,
-               .haspalette = (_Bool)(img->flags & FLAG_PALETTE),
+               .palettesz  = (img->flags & FLAG_PALETTE) ? img->palcount : 0,
        };
 
        /* There seems to be two ways of specifying that an image loops. */