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

Evas filters: Fix curve filter with RGBA 

The curve filter did not respect premultiplied values in
RGBA images. Unfortunately, the fastest solution is to unpremul
and re-premul everytime...
This commit is contained in:
Jean-Philippe Andre 2014-02-19 15:57:49 +09:00
parent 8a694314a4
commit 538d078cf0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/evas/filters/evas_filter_curve.c
View File

@ -41,12 +41,17 @@ _filter_curve_cpu_rgba(Evas_Filter_Command *cmd)
return EINA_FALSE;
}
if (src != dst)
memcpy(dst, src, len * sizeof(DATA32));
evas_data_argb_unpremul(dst, len);
// One channel (R, G or B)
if (offset >= 0)
{
for (k = len; k; k--, dst++, src++)
C_VAL(dst) = curve[C_VAL(src)];
return EINA_TRUE;
for (k = len, s = src, d = dst; k; k--, d++, s++)
C_VAL(d) = curve[C_VAL(s)];
goto premul;
}
// All RGB channels
@ -61,7 +66,8 @@ _filter_curve_cpu_rgba(Evas_Filter_Command *cmd)
for (k = len, s = src, d = dst; k; k--, d++, s++)
C_VAL(d) = curve[C_VAL(s)];
}
return EINA_TRUE;
goto premul;
}
// Alpha
@ -71,13 +77,11 @@ _filter_curve_cpu_rgba(Evas_Filter_Command *cmd)
offset = 0;
#endif
if (src != dst)
memcpy(dst, src, len * sizeof(DATA32));
evas_data_argb_unpremul(dst, len);
for (k = len, d = dst; k; k--, d++, src++)
C_VAL(d) = curve[C_VAL(src)];
evas_data_argb_premul(dst, len);
premul:
evas_data_argb_premul(dst, len);
return EINA_TRUE;
}