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

emile: opts can be NULL, so checking it before using it. 

CID 1288927
This commit is contained in:
Cedric BAIL 2015-04-25 18:58:30 +02:00
parent 1c597b4373
commit 5010daa31e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/emile/emile_image.c
View File

@ -1400,7 +1400,7 @@ _emile_jpeg_head(Emile_Image *image,
} }
/* rotation decoding */ /* rotation decoding */
if (opts->orientation) if (opts && opts->orientation)
{ {
degree = _get_orientation(m, length, &prop->flipped); degree = _get_orientation(m, length, &prop->flipped);
if (degree != 0 || prop->flipped) if (degree != 0 || prop->flipped)
@ -1430,17 +1430,17 @@ _emile_jpeg_head(Emile_Image *image,
*error = EMILE_IMAGE_LOAD_ERROR_GENERIC; *error = EMILE_IMAGE_LOAD_ERROR_GENERIC;
return EINA_FALSE; return EINA_FALSE;
} }
if (opts->scale_down_by > 1) if (opts && opts->scale_down_by > 1)
{ {
prop->w /= opts->scale_down_by; prop->w /= opts->scale_down_by;
prop->h /= opts->scale_down_by; prop->h /= opts->scale_down_by;
} }
else if (opts->dpi > 0.0) else if (opts && opts->dpi > 0.0)
{ {
prop->w = (prop->w * opts->dpi) / 90.0; prop->w = (prop->w * opts->dpi) / 90.0;
prop->h = (prop->h * opts->dpi) / 90.0; prop->h = (prop->h * opts->dpi) / 90.0;
} }
else if ((opts->w > 0) && (opts->h > 0)) else if (opts && ((opts->w > 0) && (opts->h > 0)))
{ {
unsigned int w2 = prop->w, h2 = prop->h; unsigned int w2 = prop->w, h2 = prop->h;
/* user set load_opts' w,h on the assumption /* user set load_opts' w,h on the assumption
@ -1528,7 +1528,7 @@ _emile_jpeg_head(Emile_Image *image,
prop->h = cinfo.output_height; prop->h = cinfo.output_height;
/* be nice and clip region to image. if its totally outside, fail load */ /* be nice and clip region to image. if its totally outside, fail load */
if ((opts->region.w > 0) && (opts->region.h > 0)) if (opts && ((opts->region.w > 0) && (opts->region.h > 0)))
{ {
unsigned int load_region_x = opts->region.x; unsigned int load_region_x = opts->region.x;
unsigned int load_region_y = opts->region.y; unsigned int load_region_y = opts->region.y;