cedric pushed a commit to branch evas-1.7.
commit 1d2df81edff02439bf5bf69769a5a6eae8c6e14b
Author: Cedric BAIL <[email protected]>
Date: Wed Apr 3 19:25:57 2013 +0900
backport f11dc2f184392a51a8b40e3a0e791c47653cfcdf.
---
ChangeLog | 4 ++++
NEWS | 1 +
src/modules/engines/buffer/evas_outbuf.c | 11 ++++++-----
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1ae7033..d5ba928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1228,3 +1228,7 @@
toolkits (gtk, qt). the docs dont specifically say the rules
on word finding, so being consistent is better i believe and
so we can assume the prior behavior is a bug.
+
+2013-03-04 Cedric Bail
+
+ * Fix crash in Evas Buffer engine when using output without alpha
channel.
diff --git a/NEWS b/NEWS
index 178dbe4..ec96185 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Fixes:
* Evas font: Fixed font run detection for specific cases with 2 different
fonts in the middle of a run.
* Evas cache: remove the freed worker from the pthread worker list when
it's failed to create a new thread so as not to access it if a thread is
working newly.
* Fix evas word start/end find in textblock to be consistent with other
toolkit logic on the matter
+ * Fix crash in Evas Buffer engine when using output with no alpha.
Changes since Evas 1.7.5:
-------------------------
diff --git a/src/modules/engines/buffer/evas_outbuf.c
b/src/modules/engines/buffer/evas_outbuf.c
index fc1ffba..58ce0e6 100644
--- a/src/modules/engines/buffer/evas_outbuf.c
+++ b/src/modules/engines/buffer/evas_outbuf.c
@@ -121,13 +121,14 @@ evas_buffer_outbuf_buf_new_region_for_update(Outbuf *buf,
int x, int y, int w, i
((buf->depth == OUTBUF_DEPTH_BGRA_32BPP_8888_8888)))
{
im->cache_entry.flags.alpha = 1;
+ }
+
#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get())
- evas_cache2_image_size_set(&im->cache_entry, w, h);
- else
+ if (evas_cserve2_use_get())
+ evas_cache2_image_size_set(&im->cache_entry, w, h);
+ else
#endif
- im = (RGBA_Image *)
evas_cache_image_size_set(&im->cache_entry, w, h);
- }
+ im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry,
w, h);
}
}
return im;
--
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
