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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-12 15:05:30 +0300 (Wed, 12 Aug 2009)
New Revision: 19127

Modified:
   projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:

  * clutter/x11/clutter-x11-texture-pixmap.c
    (clutter_x11_texture_pixmap_update_area_real): Remove dead code related to
    unused 'data_allocated' variable. (Coverity found it.)



Modified: projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c	2009-08-12 11:54:05 UTC (rev 19126)
+++ projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c	2009-08-12 12:05:30 UTC (rev 19127)
@@ -742,7 +742,6 @@
   GError                               *error = NULL;
   guint                                 bytes_per_line;
   char				       *data;
-  gboolean                              data_allocated = FALSE;
   int                                   err_code;
   char                                  pixel_bpp;
   gboolean                              pixel_has_alpha;
@@ -911,9 +910,6 @@
       g_error_free (error);
     }
 
-  if (data_allocated)
-    g_free (data);
-
 free_image_and_return:
   if (priv->have_shm)
     XFree (image);

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-08-12 11:54:05 UTC (rev 19126)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-08-12 12:05:30 UTC (rev 19127)
@@ -1,6 +1,9 @@
 clutter (0.8.2-0maemo44~unreleased) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * clutter/x11/clutter-x11-texture-pixmap.c
+    (clutter_x11_texture_pixmap_update_area_real): Remove dead code related to
+    unused 'data_allocated' variable. (Coverity found it.)
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Tue, 11 Aug 2009 09:50:25 +0300