devilhorns pushed a commit to branch master.
commit 672a2e36e3180f31a4f9e0e4c8d0061619244a7f
Author: Chris Michael <[email protected]>
Date: Mon Apr 29 11:29:33 2013 +0100
Use the width & height from the buffer (actual image size) when
calling evas cache image data.
When we push an updated region, be sure to account for the rectangle
position during the conversion function.
Signed-off-by: Chris Michael <[email protected]>
---
src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
index 7542cfb..e48f39b 100644
--- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
@@ -151,20 +151,21 @@ evas_swapbuf_update_region_new(Outbuf *ob, int x, int y,
int w, int h, int *cx,
{
if (!(img = ob->priv.onebuf))
{
+ int bw = 0, bh = 0;
void *data;
- data = evas_swapper_buffer_map(ob->priv.swapper, NULL, NULL);
+ data = evas_swapper_buffer_map(ob->priv.swapper, &bw, &bh);
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get())
img = (RGBA_Image
*)evas_cache2_image_data(evas_common_image_cache2_get(),
- ob->w, ob->h, data,
+ bw, bh, data,
ob->priv.destination_alpha,
EVAS_COLORSPACE_ARGB8888);
else
#endif
img = (RGBA_Image
*)evas_cache_image_data(evas_common_image_cache_get(),
- ob->w, ob->h, data,
+ bw, bh, data,
ob->priv.destination_alpha,
EVAS_COLORSPACE_ARGB8888);
@@ -312,7 +313,6 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image
*update, int x, int y, in
/* check for valid update image data */
if (!(src = update->image.data)) return;
-
bpp = depth / 8;
if (bpp <= 0) return;
@@ -360,7 +360,7 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image
*update, int x, int y, in
dst += (bpl * rect.y) + (rect.x * bpp);
func(src, dst, (update->cache_entry.w - w), (wid - rect.w),
- rect.w, rect.h, x, y, NULL);
+ rect.w, rect.h, x + rx, y + ry, NULL);
}
void
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
