mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems loading .ico files with color_count=0, and images with pixels out of range.

Browse Source
This commit is contained in:
David Capello 2010-12-10 22:55:17 -03:00
parent 06be16ad59
commit 8e007e9ca5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/file/ico_format.cpp
View File

@ -118,7 +118,7 @@ static bool load_ICO(FileOp *fop)
const ICONDIRENTRY& entry = entries[0];
int width = (entry.width == 0 ? 256: entry.width);
int height = (entry.height == 0 ? 256: entry.height);
int numcolors = 1 << entry.bpp;
int numcolors = (entry.color_count == 0 ? 256: entry.color_count);
int imgtype = IMAGE_INDEXED;
if (entry.bpp > 8)
imgtype = IMAGE_RGB;
@ -176,7 +176,11 @@ static bool load_ICO(FileOp *fop)
case 8:
c = fgetc(f);
image_putpixel(image, x, y, c);
ASSERT(c >= 0 && c < numcolors);
if (c >= 0 && c < numcolors)
image_putpixel(image, x, y, c);
else
image_putpixel(image, x, y, 0);
break;
case 24: