hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: Fix BMP load with region set and scale down 

This fixes usage of photocam on large BMP images.
Follows previous commits by @jiin.moon.
This commit is contained in:
Jean-Philippe Andre 2016-08-17 17:21:33 +09:00
parent 0193e40d8c
commit be5381960b
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/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
View File

@ -499,6 +499,7 @@ evas_image_load_file_data_bmp(void *loader_data,
if (!_evas_image_load_file_header(map, fsize, &position, &image_size, &header, error))
goto close_file;
*error = EVAS_LOAD_ERROR_GENERIC;
if (header.height < 0)
{
header.height = -header.height;
@ -511,7 +512,7 @@ evas_image_load_file_data_bmp(void *loader_data,
*error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
else
*error = EVAS_LOAD_ERROR_GENERIC;
goto close_file;
goto close_file;
}
image_w = region_w = header.width;
image_h = region_h = header.height;
@ -553,7 +554,7 @@ evas_image_load_file_data_bmp(void *loader_data,
if ((header.width != (int)prop->w) || (header.height != (int)prop->h))
{
*error = EVAS_LOAD_ERROR_GENERIC;
goto close_file;
goto close_file;
}
row_size = ceil((double)(image_w * header.bit_count) / 32) * 4;
@ -564,6 +565,9 @@ evas_image_load_file_data_bmp(void *loader_data,
if (image_size > row_size * header.height)
image_size = row_size * header.height;
if (region_set)
read_line = region_y;
if (header.bit_count < 16)
{
unsigned int i;