asdfuser pushed a commit to branch evas-1.7.

commit d30c22f8dd69118e7f7f1270510a8d9b40b0af99
Author: Daniel Willmann <[email protected]>
Date:   Wed Jun 26 18:38:24 2013 +0100

    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.
    
    Backport of 2df506feed9cc0590d635752353f9eb11e1911e6
    
    Signed-off-by: Daniel Willmann <[email protected]>
---
 ChangeLog                                        | 4 ++++
 NEWS                                             | 1 +
 src/lib/engines/common/evas_convert_colorspace.c | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e092469..5c2c826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1315,3 +1315,7 @@
 2013-06-13  Rafael Antognolli
 
         * Evas GL: Restore framebuffer after texture creation.
+
+2013-06-26  Daniel Willmann
+       * Evas: Fix evas_common_convert_yuv_42* functions to actually return
+       the converted data.
diff --git a/NEWS b/NEWS
index a845ba3..12911c2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Changes since Evas 1.7.7:
 Fixes:
    * Correctly detect if a loader support asynchronous preloading.
    * Fix memory leak in evas textgrid
+   * Evas: Fix evas_common_convert_yuv_42* functions to actually return the 
converted data.
 
 Evas 1.7.7
 
diff --git a/src/lib/engines/common/evas_convert_colorspace.c 
b/src/lib/engines/common/evas_convert_colorspace.c
index 013c2e7..d9168af 100644
--- a/src/lib/engines/common/evas_convert_colorspace.c
+++ b/src/lib/engines/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;

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev

Reply via email to