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

emile: fix jpeg loader broken with orientation 

Summary:
After applying a patch regarding region, side-effect detected.

Fixes T4390

Test Plan: make check

Reviewers: jpeg, cedric, jypark

Maniphest Tasks: T4390

Differential Revision: https://phab.enlightenment.org/D4245
This commit is contained in:
jiin.moon 2016-08-19 12:09:31 +09:00 committed by Jean-Philippe Andre
parent 4a2f14638f
commit c54bd44790
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1731,22 +1731,6 @@ _emile_jpeg_data(Emile_Image *image,
{
region = 1;
if (prop->rotated)
{
unsigned int load_region_x = 0, load_region_y = 0;
unsigned int load_region_w = 0, load_region_h = 0;
load_region_x = opts->region.x;
load_region_y = opts->region.y;
load_region_w = opts->region.w;
load_region_h = opts->region.h;
_rotate_region(&opts_region.x, &opts_region.y,
&opts_region.w, &opts_region.h,
load_region_x, load_region_y,
load_region_w, load_region_h,
w, h, degree, prop->flipped);
}
/* scale value already applied when decompress.
When access to decoded image, have to apply scale value to region value */
if (prop->scale > 1)
@ -1765,6 +1749,23 @@ _emile_jpeg_data(Emile_Image *image,
opts_region.h = opts->region.h;
}
if (prop->rotated)
{
unsigned int load_region_x = 0, load_region_y = 0;
unsigned int load_region_w = 0, load_region_h = 0;
load_region_x = opts_region.x;
load_region_y = opts_region.y;
load_region_w = opts_region.w;
load_region_h = opts_region.h;
_rotate_region(&opts_region.x, &opts_region.y,
&opts_region.w, &opts_region.h,
load_region_x, load_region_y,
load_region_w, load_region_h,
w, h, degree, prop->flipped);
}
}
if ((!region) && ((w != ie_w) || (h != ie_h)))
{