1 files changed, 35 insertions, 5 deletions

diff --git a/libraries/evas/src/lib/canvas/evas_object_image.c b/libraries/evas/src/lib/canvas/evas_object_image.c
index d9f6378..4ebea08 100644
--- a/libraries/evas/src/lib/canvas/evas_object_image.c
+++ b/libraries/evas/src/lib/canvas/evas_object_image.c
@@ -2908,11 +2908,31 @@ evas_object_image_render(Evas_Object *obj, void *output, void *context, void *su
      {
         Evas_Coord idw, idh, idx, idy;
         int ix, iy, iw, ih;
+        int img_set = 0;
 
         if (o->dirty_pixels)
           {
              if (o->func.get_pixels)
                {
+                  // Set img object for direct rendering optimization
+                  // Check for image w/h against image geometry w/h
+                  // Check for image color r,g,b,a = {255,255,255,255}
+                  // Check and make sure that there are no maps.
+                  if ( (obj->cur.geometry.w == o->cur.image.w) &&
+                       (obj->cur.geometry.h == o->cur.image.h) &&
+                       (obj->cur.color.r == 255) &&
+                       (obj->cur.color.g == 255) &&
+                       (obj->cur.color.b == 255) &&
+                       (obj->cur.color.a == 255) && 
+                       (!obj->cur.map) )
+                    {
+                       if (obj->layer->evas->engine.func->gl_img_obj_set)
+                         {
+                            obj->layer->evas->engine.func->gl_img_obj_set(output, obj, o->cur.has_alpha);
+                            img_set = 1;
+                         }
+                    }
+
                   o->func.get_pixels(o->func.get_pixels_data, obj);
                   if (o->engine_data != pixels)
                     pixels = o->engine_data;
@@ -3152,7 +3172,17 @@ evas_object_image_render(Evas_Object *obj, void *output, void *context, void *su
                   idy = ydy;
                   if (dobreak_w) break;
                }
-          }
+          }
+
+        // Unset img object 
+        if (img_set)
+          {
+             if (obj->layer->evas->engine.func->gl_img_obj_set)
+               {
+                  obj->layer->evas->engine.func->gl_img_obj_set(output, NULL, 0);
+                  img_set = 0;
+               }
+          }        
      }
 }
 
@@ -3371,10 +3401,10 @@ evas_object_image_render_pre(Evas_Object *obj)
                                  y = idy;
                                  h = ((int)(idy + idh)) - y;
                                  
-                                 r.x = ((rr->x - 1) * w) / o->cur.image.w;
-                                 r.y = ((rr->y - 1) * h) / o->cur.image.h;
-                                 r.w = ((rr->w + 2) * w) / o->cur.image.w;
-                                 r.h = ((rr->h + 2) * h) / o->cur.image.h;
+                                 r.x = (rr->x * w) / o->cur.image.w;
+                                 r.y = (rr->y * h) / o->cur.image.h;
+                                 r.w = ((rr->w * w) + (o->cur.image.w * 2) - 1) / o->cur.image.w;
+                                 r.h = ((rr->h * h) + (o->cur.image.h * 2) - 1) / o->cur.image.h;
                                  r.x += obj->cur.geometry.x + x;
                                  r.y += obj->cur.geometry.y + y;
                                  RECTS_CLIP_TO_RECT(r.x, r.y, r.w, r.h,