summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-06-26 18:38:24 +0100
committerDaniel Willmann <d.willmann@samsung.com>2013-06-26 18:53:08 +0100
commit2df506feed9cc0590d635752353f9eb11e1911e6 (patch)
tree09c22c19057e2f0b3a47f0ed6742d6a770cdca7d
parent1a2ae24e8b912dae896c628b3f9340cbf412df14 (diff)
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 <d.willmann@samsung.com>
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/common/evas_convert_colorspace.c6
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 @@
12013-06-26 Daniel Willmann
2
3 * Evas: Fix evas_common_convert_yuv_42* functions to actually return
4 the converted data.
5
12013-06-25 Tom Hacohen 62013-06-25 Tom Hacohen
2 7
3 * Evas textblock: Fixed issue with textblocks without fonts 8 * 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:
340 * Evas: Fix bs if app call image object update add after call api like fileset. 340 * Evas: Fix bs if app call image object update add after call api like fileset.
341 * Evas: Fix evas_gl direct rendering to support partial redraw. 341 * Evas: Fix evas_gl direct rendering to support partial redraw.
342 * Evas textblock: Fixed issue with textblocks without fonts segfaulting. 342 * Evas textblock: Fixed issue with textblocks without fonts segfaulting.
343 * 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
132 if (!dst) return NULL; 132 if (!dst) return NULL;
133 133
134 evas_common_convert_yuv_420p_601_rgba(data, dst, w, h); 134 evas_common_convert_yuv_420p_601_rgba(data, dst, w, h);
135 break; 135 return dst;
136 } 136 }
137 default: 137 default:
138 break; 138 break;
@@ -153,7 +153,7 @@ evas_common_convert_yuv_420_601_to(void *data, int w, int h, Evas_Colorspace csp
153 if (!dst) return NULL; 153 if (!dst) return NULL;
154 154
155 evas_common_convert_yuv_420_601_rgba(data, dst, w, h); 155 evas_common_convert_yuv_420_601_rgba(data, dst, w, h);
156 break; 156 return dst;
157 } 157 }
158 default: 158 default:
159 break; 159 break;
@@ -174,7 +174,7 @@ evas_common_convert_yuv_420T_601_to(void *data, int w, int h, Evas_Colorspace cs
174 if (!dst) return NULL; 174 if (!dst) return NULL;
175 175
176 evas_common_convert_yuv_420_601_rgba(data, dst, w, h); 176 evas_common_convert_yuv_420_601_rgba(data, dst, w, h);
177 break; 177 return dst;
178 } 178 }
179 default: 179 default:
180 break; 180 break;