* resrc.c (define_icon): Fix storage of color attributes 'planes' and 'bit
count' in icon groups.
This commit is contained in:
parent
4b7f0676e4
commit
b95f6b0c7e
|
@ -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>
|
2003-09-30 Chris Demetriou <cgd@broadcom.com>
|
||||||
|
|
||||||
* NEWS: Add an indication of the cutoff for 2.14.
|
* NEWS: Add an indication of the cutoff for 2.14.
|
||||||
|
|
|
@ -1040,10 +1040,20 @@ define_icon (struct res_id id, const struct res_res_info *resinfo,
|
||||||
cg->height = icondirs[i].height;
|
cg->height = icondirs[i].height;
|
||||||
cg->colors = icondirs[i].colorcount;
|
cg->colors = icondirs[i].colorcount;
|
||||||
|
|
||||||
cg->planes = 1;
|
if (icondirs[i].u.icon.planes)
|
||||||
cg->bits = 0;
|
cg->planes = icondirs[i].u.icon.planes;
|
||||||
while ((1 << cg->bits) < cg->colors)
|
else
|
||||||
++cg->bits;
|
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->bytes = icondirs[i].bytes;
|
||||||
cg->index = first_icon + i + 1;
|
cg->index = first_icon + i + 1;
|
||||||
|
|
Loading…
Reference in New Issue