[EGIT] [core/efl] master 09/10: Evas filters: Fix handling of FILL for image filters

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=52e4bbda7b90271f1bafceb4263d68f45fedda2c

commit 52e4bbda7b90271f1bafceb4263d68f45fedda2c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Oct 1 19:59:22 2015 +0900

    Evas filters: Fix handling of FILL for image filters
    
    Note: Image filters still need a LOT of work to be usable.
---
 src/lib/evas/canvas/evas_object_image.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_image.c 
b/src/lib/evas/canvas/evas_object_image.c
index 3fd09fc..ee177c2 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -159,7 +159,7 @@ static void evas_object_image_render(Evas_Object *eo_obj, 
Evas_Object_Protected_
                                     int x, int y, Eina_Bool do_async);
 static void _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                                void *output, void *context, void *surface,
-                               int x, int y, Eina_Bool do_async);
+                               int x, int y, int l, int t, int r, int b, 
Eina_Bool do_async);
 static void evas_object_image_free(Evas_Object *eo_obj,
                                   Evas_Object_Protected_Data *obj);
 static void evas_object_image_render_pre(Evas_Object *eo_obj,
@@ -3183,6 +3183,8 @@ _evas_image_evas_filter_input_render(Eo *eo_obj, 
Evas_Image_Data *o,
      {
         l = 0;
         t = 0;
+        r = 0;
+        b = 0;
      }
 
    if (!surface)
@@ -3198,7 +3200,8 @@ _evas_image_evas_filter_input_render(Eo *eo_obj, 
Evas_Image_Data *o,
    ENFN->context_render_op_set(output, context, EVAS_RENDER_BLEND);
 
    _evas_image_render(eo_obj, obj, output, context, surface,
-                      l - obj->cur->geometry.x, t - obj->cur->geometry.y, 
do_async);
+                      l - obj->cur->geometry.x, t - obj->cur->geometry.y,
+                      l, t, r, b, do_async);
 
    if (!input_stolen)
      {
@@ -3280,12 +3283,13 @@ evas_object_image_render(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *obj, v
           return;
      }
 
-   _evas_image_render(eo_obj, obj, output, context, surface, x, y, do_async);
+   _evas_image_render(eo_obj, obj, output, context, surface, x, y, 0, 0, 0, 0, 
do_async);
 }
 
 static void
 _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
-                   void *output, void *context, void *surface, int x, int y, 
Eina_Bool do_async)
+                   void *output, void *context, void *surface, int x, int y,
+                   int l, int t, int r, int b, Eina_Bool do_async)
 {
    Evas_Image_Data *o = obj->private_data;
    int imagew, imageh, uvw, uvh;
@@ -3358,7 +3362,6 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data 
*obj,
    if (pixels)
      {
         Evas_Coord idw, idh, idx, idy;
-        int l = 0, r = 0, t = 0, b = 0;
         int ix, iy, iw, ih;
 
         if ((obj->map->cur.map) && (obj->map->cur.map->count > 3) && 
(obj->map->cur.usemap))

--