]> git.draconx.ca Git - liblbx.git/blobdiff - src/image.c
liblbx: Add a field to lbx_colour indicating which entries are used.
[liblbx.git] / src / image.c
index d58314544373a38ce86825d1ed4e511aa1044062..c8a71650fbb872f24a7a7140e8e96a43e4eaedc0 100644 (file)
@@ -341,9 +341,10 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
                }
 
                palette[i] = (struct lbx_colour){
-                       .red   = entry[1] << 2,
-                       .green = entry[2] << 2,
-                       .blue  = entry[3] << 2,
+                       .red    = entry[1] << 2,
+                       .green  = entry[2] << 2,
+                       .blue   = entry[3] << 2,
+                       .active = 1,
                };
        }
 
@@ -368,7 +369,6 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 
        for (i = 0; i < img->palcount; i++) {
                rc = img->fops->read(entry, sizeof entry, img->f);
-
                if (rc < sizeof entry) {
                        goto readerr;
                }
@@ -379,9 +379,10 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
                }
 
                palette[img->palstart + i] = (struct lbx_colour){
-                       .red   = entry[1] << 2,
-                       .green = entry[2] << 2,
-                       .blue  = entry[3] << 2,
+                       .red    = entry[1] << 2,
+                       .green  = entry[2] << 2,
+                       .blue   = entry[3] << 2,
+                       .active = 1,
                };
        }