[maemo-commits] [maemo-commits] r16654 - projects/haf/trunk/hildon-thumbnail/daemon/plugins

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-13 13:52:02 +0200 (Thu, 13 Nov 2008)
New Revision: 16654

Modified:
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
Removing gdkpixbuf dep

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-13 11:45:30 UTC (rev 16653)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-13 11:52:02 UTC (rev 16654)
@@ -123,7 +123,7 @@
 	}
 }
 
-void
+gboolean
 hildon_thumbnail_outplugin_is_active (void) 
 {
 	if (!had_init) {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-13 11:45:30 UTC (rev 16653)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-13 11:52:02 UTC (rev 16654)
@@ -92,21 +92,12 @@
 static gboolean
 create_output (OutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime)
 {
-	GdkPixbuf *pixbuf = NULL;
 	GError *error = NULL;
 
-	pixbuf = gdk_pixbuf_new_from_data(data,
-			GDK_COLORSPACE_RGB, /* RGB-colorspace */
-			FALSE, /* No alpha-channel */
-			bpp/3, /* Bits per RGB-component */
-			width, height, /* Dimensions */
-			width*3, /* Number of bytes between lines (ie stride) */
-			NULL, NULL); /* Callbacks */
-
-	hildon_thumbnail_outplugins_do_out (gdk_pixbuf_get_pixels    (pixbuf), 
-					    gdk_pixbuf_get_width     (pixbuf),
-					    gdk_pixbuf_get_height    (pixbuf),
-					    gdk_pixbuf_get_rowstride (pixbuf),
+	hildon_thumbnail_outplugins_do_out (data, 
+					    width,
+					    height,
+					    width*3,
 					    target,
 					    mtime, 
 					    uri, 
@@ -115,11 +106,9 @@
 	if (error) {
 		g_warning("%s\n", error->message);
 		g_error_free(error);
-		g_object_unref(pixbuf);
 		return FALSE;
 	}
 
-	g_object_unref(pixbuf);
 	return TRUE;
 }