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

Evas jpeg loader: Fixed a couple of compilation warnings. 

There are a couple more *important* warnings. The switch case at line 564
does not cover all options.

SVN revision: 67784
This commit is contained in:
Tom Hacohen 2012-02-09 10:21:17 +00:00
parent 671cda7b73
commit edbdd6a1ad
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
View File

@ -272,6 +272,9 @@ evas_image_load_file_head_jpeg_internal(Image_Entry *ie,
*error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
return EINA_FALSE; return EINA_FALSE;
} }
degree = 0;
change_wh = EINA_FALSE;
jpeg_create_decompress(&cinfo); jpeg_create_decompress(&cinfo);
if (_evas_jpeg_membuf_src(&cinfo, map, length)) if (_evas_jpeg_membuf_src(&cinfo, map, length))
@ -971,7 +974,7 @@ done:
if (ie->flags.rotated) if (ie->flags.rotated)
{ {
DATA32 *data1, *data2, *to, *from; DATA32 *data1, *data2, *to, *from;
int x, y, w, h, hw; int lx, ly, lw, lh, hw;
if (change_wh) if (change_wh)
{ {
@ -980,22 +983,22 @@ done:
ie->h = tmp; ie->h = tmp;
} }
w = ie->w; lw = ie->w;
h = ie->h; lh = ie->h;
hw =w * h; hw =lw * lh;
data1 = evas_cache_image_pixels(ie); data1 = evas_cache_image_pixels(ie);
if (degree == 180) if (degree == 180)
{ {
DATA32 tmp; DATA32 tmpd;
data2 = data1 + (h * w) -1; data2 = data1 + (lh * lw) -1;
for (x = (w * h) / 2; --x >= 0;) for (lx = (lw * lh) / 2; --lx >= 0;)
{ {
tmp = *data1; tmpd = *data1;
*data1 = *data2; *data1 = *data2;
*data2 = tmp; *data2 = tmpd;
data1++; data1++;
data2--; data2--;
} }
@ -1008,26 +1011,26 @@ done:
if (degree == 90) if (degree == 90)
{ {
to = data1 + w - 1; to = data1 + lw - 1;
hw = -hw - 1; hw = -hw - 1;
} }
else if (degree == 270) else if (degree == 270)
{ {
to = data1 + hw - w; to = data1 + hw - lw;
w = -w; lw = -lw;
hw = hw + 1; hw = hw + 1;
} }
if (to) if (to)
{ {
from = data2; from = data2;
for (x = ie->w; --x >= 0;) for (lx = ie->w; --lx >= 0;)
{ {
for (y =ie->h; --y >= 0;) for (ly =ie->h; --ly >= 0;)
{ {
*to = *from; *to = *from;
from++; from++;
to += w; to += lw;
} }
to += hw; to += hw;
} }