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

Evas filters: Fix crash in displace filter 

Simplify and fix map traversal code
This commit is contained in:
Jean-Philippe Andre 2014-02-17 19:37:32 +09:00
parent af34bc8599
commit d70b805e6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/evas/filters/evas_filter_displace.c
View File

@ -18,7 +18,8 @@ _filter_displace_cpu_alpha_do(int w, int h, int map_w, int map_h, int intensity,
if (map_y >= map_h) map_y = 0;
map = map_start + (map_y * map_stride);
for (x = 0, map_x = 0; x < w; x++, dst++, src++, map_x++)
for (x = 0, map_x = 0; x < w;
x++, dst++, src++, map_x++, map += sizeof(DATA32))
{
int offx = 0, offy = 0, offx_dec = 0, offy_dec = 0, val = 0;
Eina_Bool out = 0;
@ -29,7 +30,6 @@ _filter_displace_cpu_alpha_do(int w, int h, int map_w, int map_h, int intensity,
map_x = 0;
map = map_start + (map_y * map_stride);
}
else map += sizeof(DATA32);
// x
val = ((int) map[dx] - 128) * intensity;
@ -92,7 +92,8 @@ _filter_displace_cpu_rgba_do(int w, int h, int map_w, int map_h, int intensity,
if (map_y >= map_h) map_y = 0;
map = (DATA8 *) (map_start + map_y * map_w);
for (x = 0, map_x = 0; x < w; x++, dst++, src++, map_x++)
for (x = 0, map_x = 0; x < w;
x++, dst++, src++, map_x++, map += sizeof(DATA32))
{
int offx = 0, offy = 0, offx_dec = 0, offy_dec = 0, val = 0;
DATA32 col = 0;
@ -104,7 +105,6 @@ _filter_displace_cpu_rgba_do(int w, int h, int map_w, int map_h, int intensity,
map_x = 0;
map = (DATA8 *) (map_start + map_y * map_w);
}
else map += sizeof(DATA32);
if (!map[ALPHA]) continue;
if (!unpremul && map[ALPHA] != 0xFF)