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

emile: reduce the amount of clobbered variable.

This commit is contained in:
Cedric BAIL 2016-12-15 11:17:34 -08:00
parent 8a57cb44b2
commit e12d59e216
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1380,7 +1380,7 @@ _emile_jpeg_head(Emile_Image *image,
unsigned int property_size,
Emile_Image_Load_Error *error)
{
Emile_Image_Load_Opts *opts = NULL;
volatile Emile_Image_Load_Opts *opts = (image->load_opts) ? &image->opts : NULL;
const unsigned char *m;
unsigned int scalew, scaleh;
struct jpeg_decompress_struct cinfo;
@ -1388,9 +1388,9 @@ _emile_jpeg_head(Emile_Image *image,
unsigned int length;
/* for rotation decoding */
int degree = 0;
Eina_Bool change_wh = EINA_FALSE;
unsigned int load_opts_w = 0, load_opts_h = 0;
volatile int degree = 0;
volatile Eina_Bool change_wh = EINA_FALSE;
volatile unsigned int load_opts_w = 0, load_opts_h = 0;
if (sizeof(Emile_Image_Property) != property_size)
return EINA_FALSE;
@ -1399,9 +1399,6 @@ _emile_jpeg_head(Emile_Image *image,
if (!m)
return EINA_FALSE;
if (image->load_opts)
opts = &image->opts;
memset(&cinfo, 0, sizeof(cinfo));
cinfo.err = jpeg_std_error(&(jerr.pub));
cinfo.client_data = NULL;
@ -1629,17 +1626,18 @@ _emile_jpeg_data(Emile_Image *image,
Emile_Image_Load_Error *error)
{
/* Handle RGB, ARGB, GRY and AGRY */
Emile_Image_Load_Opts *opts = NULL;
volatile Emile_Image_Load_Opts *opts = (image->load_opts) ? &image->opts : NULL;
unsigned int w, h;
struct jpeg_decompress_struct cinfo;
struct _JPEG_error_mgr jerr;
const unsigned char *m = NULL;
uint8_t *ptr, *line[16], *data;
uint32_t *ptr2 = NULL, *ptr_rotate = NULL;
volatile uint32_t *ptr2 = NULL;
uint32_t *ptr_rotate = NULL;
uint16_t *ptrag = NULL, *ptrag_rotate = NULL;
uint8_t *ptrg = NULL, *ptrg_rotate = NULL;
unsigned int x, y, l, i, scans;
int region = 0;
volatile int region = 0;
/* rotation setting */
unsigned int ie_w = 0, ie_h = 0;
struct
@ -1648,12 +1646,12 @@ _emile_jpeg_data(Emile_Image *image,
} opts_region = {0, 0, 0, 0};
volatile int degree = 0;
volatile Eina_Bool change_wh = EINA_FALSE;
Eina_Bool line_done = EINA_FALSE;
Eina_Bool ptrg_free = EINA_FALSE;
Eina_Bool ptrag_free = EINA_FALSE;
Eina_Bool r = EINA_FALSE;
volatile Eina_Bool line_done = EINA_FALSE;
volatile Eina_Bool ptrg_free = EINA_FALSE;
volatile Eina_Bool ptrag_free = EINA_FALSE;
volatile Eina_Bool r = EINA_FALSE;
unsigned int length;
unsigned short count = 0;
volatile unsigned short count = 0;
if (sizeof(Emile_Image_Property) != property_size)
return EINA_FALSE;
@ -1662,9 +1660,6 @@ _emile_jpeg_data(Emile_Image *image,
if (!m)
return EINA_FALSE;
if (image->load_opts)
opts = &image->opts;
memset(&cinfo, 0, sizeof(cinfo));
if (prop->rotated)
{
@ -1854,7 +1849,7 @@ _emile_jpeg_data(Emile_Image *image,
else
{
ptr2 = malloc(w * h * sizeof(uint32_t));
ptr_rotate = ptr2;
ptr_rotate = (uint32_t*) ptr2;
}
}
else