From b6b9744f192cdb0e82d613f4307cb7dfc7baa140 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 26 Dec 2011 23:12:50 +0000 Subject: [PATCH] Evas (Wayland Shm Engine): Cleanup of commented out code. Fix calculation of update region. SVN revision: 66540 --- .../modules/engines/wayland_shm/evas_engine.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c b/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c index 466ac9ddc4..7c55517451 100644 --- a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c +++ b/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c @@ -185,18 +185,7 @@ eng_output_resize(void *data, int w, int h) if (!(re = (Render_Engine *)data)) return; - if (re->ob) - { - re->outbuf_resize(re->ob, w, h); - /* int rot; */ - /* void *dest; */ - - /* dest = re->ob->priv.dest; */ - /* rot = re->ob->rotation; */ - /* re->outbuf_free(re->ob); */ - /* re->ob = evas_outbuf_setup(w, h, rot, dest); */ - } - + if (re->ob) re->outbuf_resize(re->ob, w, h); if (re->tb) evas_common_tilebuf_free(re->tb); if ((re->tb = evas_common_tilebuf_new(w, h))) evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); @@ -267,10 +256,12 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i if (!re->cur_rect) { evas_common_tilebuf_free_render_rects(re->rects); - evas_common_tilebuf_clear(re->tb); re->rects = NULL; re->end = EINA_TRUE; } + if ((ux + uw) > re->ob->w) uw = re->ob->w - ux; + if ((uy + uh) > re->ob->h) uh = re->ob->h - uy; + if ((uw <= 0) || (uh <= 0)) return NULL; surface = re->outbuf_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); if (x) *x = ux;