[maemo-commits] [maemo-commits] r18457 - in projects/haf/trunk/clutter0.8: clutter/pango debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-21 18:01:14 +0300 (Thu, 21 May 2009)
New Revision: 18457

Modified:
   projects/haf/trunk/clutter0.8/clutter/pango/pangoclutter-render.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
Valgrind spotted a leak:
* clutter/pango/pangoclutter-render.c
  (pango_clutter_ensure_glyph_cache_for_layout): Don't leak the iterator.



Modified: projects/haf/trunk/clutter0.8/clutter/pango/pangoclutter-render.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/pango/pangoclutter-render.c	2009-05-21 14:39:51 UTC (rev 18456)
+++ projects/haf/trunk/clutter0.8/clutter/pango/pangoclutter-render.c	2009-05-21 15:01:14 UTC (rev 18457)
@@ -284,7 +284,7 @@
   PangoContext    *context;
   PangoFontMap    *fontmap;
   PangoRenderer   *renderer;
-  PangoLayoutIter *iter;
+  PangoLayoutIter *iter, *orig_iter;
  
   g_return_if_fail (PANGO_IS_LAYOUT (layout));
  
@@ -294,7 +294,7 @@
   renderer = _pango_clutter_font_map_get_renderer
     (PANGO_CLUTTER_FONT_MAP (fontmap));
  
-  if ((iter = pango_layout_get_iter (layout)) == NULL)
+  if ((iter = orig_iter = pango_layout_get_iter (layout)) == NULL)
     return;
  
   do
@@ -325,7 +325,7 @@
     }
   while (pango_layout_iter_next_line (iter));
  
-  pango_layout_iter_free (iter);
+  pango_layout_iter_free (orig_iter);
 }
 
 static void

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-05-21 14:39:51 UTC (rev 18456)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-05-21 15:01:14 UTC (rev 18457)
@@ -1,10 +1,15 @@
 clutter (0.8.2-0maemo32~unreleased) unstable; urgency=low
 
+  Gordon:
   * Fix for white rectangles on screen rotation
     (clutter/cogl/common/cogl-clip-stack.c) - now only attempt stencil
     buffer operations IF we have a stencil buffer (we disable this in GLES
     to try and increase rendering speed/decrease memory usage).    
 
+  Kimmo:
+  * clutter/pango/pangoclutter-render.c
+    (pango_clutter_ensure_glyph_cache_for_layout): Don't leak the iterator.
+
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 20 May 2009 17:13:03 +0300
 
 clutter (0.8.2-0maemo31) unstable; urgency=low