Revert "Upstream merge"

[framework/uifw/evas.git] / src / lib / engines / common / evas_scale_smooth_scaler_downx.c

diff --git a/src/lib/engines/common/evas_scale_smooth_scaler_downx.c b/src/lib/engines/common/evas_scale_smooth_scaler_downx.c
index f413b22..a443c85 100644 (file)
--- a/src/lib/engines/common/evas_scale_smooth_scaler_downx.c
+++ b/src/lib/engines/common/evas_scale_smooth_scaler_downx.c
@@ -3,7 +3,7 @@
    DATA32 *pix, *dptr, *pbuf, **yp;
    int r, g, b, a, rr, gg, bb, aa;
    int *xp, xap, yap, pos;
-   int dyy, dxx;
+   //int dyy, dxx;
    int w = dst_clip_w;
 #ifdef EVAS_SLI
    int ysli = dst_clip_y;
@@ -11,13 +11,13 @@
 
    dptr = dst_ptr;
    pos = (src_region_y * src_w) + src_region_x;
-   dyy = dst_clip_y - dst_region_y;
-   dxx = dst_clip_x - dst_region_x;
+   //dyy = dst_clip_y - dst_region_y;
+   //dxx = dst_clip_x - dst_region_x;
 
-   xp = xpoints + dxx;
-   yp = ypoints + dyy;
-   xapp = xapoints + dxx;
-   yapp = yapoints + dyy;
+   xp = xpoints;// + dxx;
+   yp = ypoints;// + dyy;
+   xapp = xapoints;// + dxx;
+   yapp = yapoints;// + dyy;
    pbuf = buf;
 
    if (src->cache_entry.flags.alpha)
@@ -82,7 +82,10 @@
                            g += ((gg - g) * yap) >> 8;
                            b += ((bb - b) * yap) >> 8;
                         }
-                      *pbuf++ = ARGB_JOIN(a >> 4, r >> 4, g >> 4, b >> 4);
+                       *pbuf++ = ARGB_JOIN(((a + (1 << 3)) >> 4),
+                                           ((r + (1 << 3)) >> 4),
+                                           ((g + (1 << 3)) >> 4),
+                                           ((b + (1 << 3)) >> 4));
                       xp++;  xapp++;
                    }
 
@@ -94,8 +97,8 @@
             pbuf = buf;
             dptr += dst_w;  dst_clip_w = w;
             yp++;  yapp++;
-            xp = xpoints + dxx;
-            xapp = xapoints + dxx;
+            xp = xpoints;// + dxx;
+            xapp = xapoints;// + dxx;
          }
      }
    else
@@ -159,7 +162,10 @@
                                 g += ((gg - g) * yap) >> 8;
                                 b += ((bb - b) * yap) >> 8;
                              }
-                           *pbuf++ = ARGB_JOIN(0xff, r >> 4, g >> 4, b >> 4);
+                            *pbuf++ = ARGB_JOIN(0xff,
+                                                ((r + (1 << 3)) >> 4),
+                                                ((g + (1 << 3)) >> 4),
+                                                ((b + (1 << 3)) >> 4));
                            xp++;  xapp++;
                         }
                    }
@@ -169,8 +175,8 @@
 
                  dptr += dst_w;  dst_clip_w = w;
                  yp++;  yapp++;
-                 xp = xpoints + dxx;
-                 xapp = xapoints + dxx;
+                 xp = xpoints;// + dxx;
+                 xapp = xapoints;// + dxx;
               }
          }
        else
@@ -229,7 +235,10 @@
                                 g += ((gg - g) * yap) >> 8;
                                 b += ((bb - b) * yap) >> 8;
                              }
-                           *pbuf++ = ARGB_JOIN(0xff, r >> 4, g >> 4, b >> 4);
+                            *pbuf++ = ARGB_JOIN(0xff,
+                                                ((r + (1 << 3)) >> 4),
+                                                ((g + (1 << 3)) >> 4),
+                                                ((b + (1 << 3)) >> 4));
                            xp++;  xapp++;
                         }
 
@@ -242,8 +251,8 @@
                  pbuf = buf;
                  dptr += dst_w;  dst_clip_w = w;
                  yp++;  yapp++;
-                 xp = xpoints + dxx;
-                 xapp = xapoints + dxx;
+                 xp = xpoints;// + dxx;
+                 xapp = xapoints;// + dxx;
               }
          }
      }