enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix bmp decoding error. other tool like GIMP 

can handle image size error


SVN revision: 76546
This commit is contained in:
Jiyoun Park 2012-09-12 16:34:45 +00:00
parent 805d333284
commit b2004aebc5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
View File

@ -456,7 +456,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
comp = tmp2; // compression method
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
image_size = tmp2; // bitmap data size
if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
//hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@ -484,7 +484,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
comp = tmp2; // compression method
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
image_size = tmp2; // bitmap data size
if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
//hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@ -512,7 +512,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
comp = tmp2; // compression method
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
image_size = tmp2; // bitmap data size
if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
//hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@ -550,7 +550,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
comp = tmp2; // compression method
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
image_size = tmp2; // bitmap data size
if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
//hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
if (!read_int(map, fsize, &position, &tmp2)) goto close_file;