averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-25 11:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ICON: allow writing 256x256 icon rasters (#8569)

Browse Source 
The previous code would limit itself to writing 255x255 images, while
ICON supports rasters up to 256 pixels; to do so, the width and/or
height have to be 0, as that is interpreted as 256.

Actually fixes https://github.com/ImageMagick/ImageMagick/issues/1577
This commit is contained in:
Andrea Pappacoda
2026-02-16 03:11:14 +01:00
committed by GitHub
parent 8f3c54fb80
commit 4e625f0123
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coders/icon.c
+4 -3
View File
@@ -1100,7 +1100,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
bits_per_pixel,
planes;
if ((next->columns > 255L) && (next->rows > 255L) &&
if ((next->columns > 256L) && (next->rows > 256L) &&
((next->compression == UndefinedCompression) ||
(next->compression == ZipCompression)))
{
@@ -1383,8 +1383,9 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
/*
Write 40-byte version 3+ bitmap header.
*/
directory->icons[scene]->width=(unsigned char) width;
directory->icons[scene]->height=(unsigned char) height;
/* The value 0 is accepted as representing a width of 256 */
directory->icons[scene]->width=(unsigned char) width % 256;
directory->icons[scene]->height=(unsigned char) height % 256;
directory->icons[scene]->colors=(unsigned char) number_colors;
directory->icons[scene]->reserved=0;
directory->icons[scene]->planes=planes;