From bf46a1d26c0f9bf04a540f5ccfaa204d7d2caa24 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Wed, 22 Jan 2014 18:41:00 +0900
Subject: [PATCH] Evas filters: Simplify clip_to_target

---
 src/lib/evas/filters/evas_filter.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index 433e788054..6a1781f5f3 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -1344,10 +1344,9 @@ _clip_to_target(int *sx /* OUT */, int *sy /* OUT */, int sw, int sh,
    if (ox > 0)
      {
         (*dx) = ox;
-        if (((*dx) + sw) > (dw))
+        (*cols) = sw;
+        if (((*dx) + (*cols)) > (dw))
           (*cols) = dw - (*dx);
-        else
-          (*cols) = sw;
      }
    else if (ox < 0)
      {
@@ -1364,10 +1363,9 @@ _clip_to_target(int *sx /* OUT */, int *sy /* OUT */, int sw, int sh,
    if (oy > 0)
      {
         (*dy) = oy;
-        if (((*dy) + sh) > (dh))
+        (*rows) = sh;
+        if (((*dy) + (*rows)) > (dh))
           (*rows) = dh - (*dy);
-        else
-          (*rows) = sh;
      }
    else if (oy < 0)
      {