From 2df506feed9cc0590d635752353f9eb11e1911e6 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 26 Jun 2013 18:38:24 +0100 Subject: [PATCH] evas_convert_colorspace: Be nice and actually return the converted data Fixes a memory leaks in evas_common_convert_yuv_42* and actually makes these functions more useful. It's a win-win. Signed-off-by: Daniel Willmann --- ChangeLog | 5 +++++ NEWS | 1 + src/lib/evas/common/evas_convert_colorspace.c | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce224f9e43..4763b4f392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-06-26 Daniel Willmann + + * Evas: Fix evas_common_convert_yuv_42* functions to actually return + the converted data. + 2013-06-25 Tom Hacohen * Evas textblock: Fixed issue with textblocks without fonts diff --git a/NEWS b/NEWS index f5afb226a7..ebafdf83e9 100644 --- a/NEWS +++ b/NEWS @@ -340,3 +340,4 @@ Fixes: * Evas: Fix bs if app call image object update add after call api like fileset. * Evas: Fix evas_gl direct rendering to support partial redraw. * Evas textblock: Fixed issue with textblocks without fonts segfaulting. + * Evas: Fix evas_common_convert_yuv_42* functions to actually return the converted data. diff --git a/src/lib/evas/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c index 122780499e..6112a39ee6 100644 --- a/src/lib/evas/common/evas_convert_colorspace.c +++ b/src/lib/evas/common/evas_convert_colorspace.c @@ -132,7 +132,7 @@ evas_common_convert_yuv_422P_601_to(void *data, int w, int h, Evas_Colorspace cs if (!dst) return NULL; evas_common_convert_yuv_420p_601_rgba(data, dst, w, h); - break; + return dst; } default: break; @@ -153,7 +153,7 @@ evas_common_convert_yuv_420_601_to(void *data, int w, int h, Evas_Colorspace csp if (!dst) return NULL; evas_common_convert_yuv_420_601_rgba(data, dst, w, h); - break; + return dst; } default: break; @@ -174,7 +174,7 @@ evas_common_convert_yuv_420T_601_to(void *data, int w, int h, Evas_Colorspace cs if (!dst) return NULL; evas_common_convert_yuv_420_601_rgba(data, dst, w, h); - break; + return dst; } default: break;