* resrc.c (define_icon): Fix storage of color attributes 'planes' and 'bit

count' in icon groups.
This commit is contained in:
Christopher Faylor 2003-10-02 14:13:10 +00:00
parent 4b7f0676e4
commit b95f6b0c7e
2 changed files with 19 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2003-10-01 Martin Fuchs <martin-fuchs@gmx.net>
* resrc.c (define_icon): Fix storage of color attributes 'planes' and
'bit count' in icon groups.
2003-09-30 Chris Demetriou <cgd@broadcom.com>
* NEWS: Add an indication of the cutoff for 2.14.

View File

@ -1040,10 +1040,20 @@ define_icon (struct res_id id, const struct res_res_info *resinfo,
cg->height = icondirs[i].height;
cg->colors = icondirs[i].colorcount;
cg->planes = 1;
cg->bits = 0;
while ((1 << cg->bits) < cg->colors)
++cg->bits;
if (icondirs[i].u.icon.planes)
cg->planes = icondirs[i].u.icon.planes;
else
cg->planes = 1;
if (icondirs[i].u.icon.bits)
cg->bits = icondirs[i].u.icon.bits;
else
{
cg->bits = 0;
while ((1L << cg->bits) < cg->colors)
++cg->bits;
}
cg->bytes = icondirs[i].bytes;
cg->index = first_icon + i + 1;