diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c b/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c index 490a978..4dee9a2 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c +++ b/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c | |||
@@ -21,7 +21,7 @@ evas_outbuf_resize(Outbuf *ob, int w, int h) | |||
21 | } | 21 | } |
22 | 22 | ||
23 | Outbuf * | 23 | Outbuf * |
24 | evas_outbuf_setup(int w, int h, int rot, void *dest) | 24 | evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest) |
25 | { | 25 | { |
26 | Outbuf *ob = NULL; | 26 | Outbuf *ob = NULL; |
27 | 27 | ||
@@ -31,6 +31,7 @@ evas_outbuf_setup(int w, int h, int rot, void *dest) | |||
31 | ob->h = h; | 31 | ob->h = h; |
32 | ob->rotation = rot; | 32 | ob->rotation = rot; |
33 | ob->priv.dest = dest; | 33 | ob->priv.dest = dest; |
34 | ob->priv.destination_alpha = alpha; | ||
34 | 35 | ||
35 | ob->priv.buffer = | 36 | ob->priv.buffer = |
36 | (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), | 37 | (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), |
@@ -56,7 +57,7 @@ evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *c | |||
56 | im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); | 57 | im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); |
57 | if (im) | 58 | if (im) |
58 | { | 59 | { |
59 | im->cache_entry.flags.alpha = 1; | 60 | im->cache_entry.flags.alpha = ob->priv.destination_alpha; |
60 | im = (RGBA_Image *)evas_cache_image_size_set(&im->cache_entry, w, h); | 61 | im = (RGBA_Image *)evas_cache_image_size_set(&im->cache_entry, w, h); |
61 | } | 62 | } |
62 | 63 | ||