aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_object_image.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-05-28 17:59:59 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-06-25 14:36:08 +0900
commit225c0f937a3a5c40aaf9cb39ba73bfa65dd32d64 (patch)
treed892a56dac749e29c2c760a4b4a8f94d546cafd4 /src/lib/evas/canvas/evas_object_image.c
parentEvas filters: Pass object scale to Lua state (diff)
downloadefl-225c0f937a3a5c40aaf9cb39ba73bfa65dd32d64.tar.gz
Evas filters: Pass edje state name & value to the filters
From Edje, pass the current state info (name and value) as well as the next state and the transition position when applicable.
Diffstat (limited to 'src/lib/evas/canvas/evas_object_image.c')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index bca2af5393..bbf5c80217 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3268,7 +3268,8 @@ start_draw:
W = obj->cur->geometry.w;
H = obj->cur->geometry.h;
- if (pgm && evas_filter_program_state_set(pgm, eo_obj, obj))
+#warning implement state_set from edje
+ if (pgm && evas_filter_program_state_set(pgm, eo_obj, obj, NULL, 0.0, NULL, 0.0, 0.0))
redraw = EINA_TRUE;
if (!redraw && o->cur->filter->output)
@@ -3309,7 +3310,7 @@ start_draw:
{
pgm = evas_filter_program_new("Image", EINA_FALSE);
evas_filter_program_source_set_all(pgm, o->cur->filter->sources);
- evas_filter_program_state_set(pgm, eo_obj, obj);
+ evas_filter_program_state_set(pgm, eo_obj, obj, NULL, 0.0, NULL, 0.0, 0.0);
ok = evas_filter_program_parse(pgm, o->cur->filter->code);
if (!ok) goto state_write;
}
@@ -4840,7 +4841,7 @@ _evas_image_filter_program_set(Eo *eo_obj, Evas_Image_Data *o, const char *arg)
{
pgm = evas_filter_program_new("Evas_Text: Filter Program", EINA_FALSE);
evas_filter_program_source_set_all(pgm, fcow->sources);
- evas_filter_program_state_set(pgm, eo_obj, obj);
+ evas_filter_program_state_set(pgm, eo_obj, obj, NULL, 0.0, NULL, 0.0, 0.0);
if (!evas_filter_program_parse(pgm, arg))
{
ERR("Parsing failed!");