[maemo-commits] [maemo-commits] r16892 - in projects/haf/trunk/hildon-thumbnail/daemon: . plugins

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Dec 8 18:46:07 EET 2008
Author: pvanhoof
Date: 2008-12-08 18:46:05 +0200 (Mon, 08 Dec 2008)
New Revision: 16892

Modified:
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
Possibility to pass has_alpha

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-12-08 16:46:05 UTC (rev 16892)
@@ -182,14 +182,14 @@
 
 
 typedef void (*OutFunc) (const guchar *rgb8_pixmap, guint width, guint height, 
-			 guint rowstride, guint bits_per_sample, 
+			 guint rowstride, guint bits_per_sample, gboolean has_alpha,
 			 HildonThumbnailPluginOutType type, guint64 mtime, 
 			 const gchar *uri, GError **error);
 
 void
 hildon_thumbnail_outplugins_do_out (const guchar *rgb8_pixmap,  guint width, 
 				    guint height, guint rowstride, 
-				    guint bits_per_sample, 
+				    guint bits_per_sample, gboolean has_alpha,
 				    HildonThumbnailPluginOutType type, guint64 mtime, 
 				    const gchar *uri, GError **error)
 {
@@ -212,7 +212,7 @@
 			if (g_module_symbol (module, "hildon_thumbnail_outplugin_is_active", (gpointer *) &isac_func)) {
 				if (isac_func ()) {
 
-					out_func (rgb8_pixmap, width, height, rowstride, bits_per_sample, type, mtime, uri, &nerror);
+					out_func (rgb8_pixmap, width, height, rowstride, bits_per_sample, has_alpha, type, mtime, uri, &nerror);
 
 					if (nerror) {
 						if (!errors) {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-12-08 16:46:05 UTC (rev 16892)
@@ -65,6 +65,7 @@
 void        hildon_thumbnail_outplugins_do_out    (const guchar *rgb8_pixmap, 
 						   guint width, guint height,
 						   guint rowstride, guint bits_per_sample,
+						   gboolean has_alpha,
 						   HildonThumbnailPluginOutType type,
 						   guint64 mtime, 
 						   const gchar *uri, 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-12-08 16:46:05 UTC (rev 16892)
@@ -234,6 +234,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, uri, 
 							    &nerror);
@@ -256,6 +257,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
 							    mtime, uri, 
 							    &nerror);
@@ -282,6 +284,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, uri, 
 							    &nerror);

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-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-12-08 16:46:05 UTC (rev 16892)
@@ -204,6 +204,7 @@
 hildon_thumbnail_outplugin_out (const guchar *rgb8_pixmap, 
 				guint width, guint height,
 				guint rowstride, guint bits_per_sample,
+				gboolean has_alpha,
 				HildonThumbnailPluginOutType type,
 				guint64 mtime, 
 				const gchar *uri, 
@@ -230,7 +231,7 @@
 	}
 
 	pixbuf = gdk_pixbuf_new_from_data ((const guchar*) rgb8_pixmap, 
-					   GDK_COLORSPACE_RGB, FALSE, 
+					   GDK_COLORSPACE_RGB, has_alpha, 
 					   bits_per_sample, width, height, rowstride,
 					   NULL, NULL);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-12-08 16:46:05 UTC (rev 16892)
@@ -222,6 +222,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf_large),
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, 
 							    uri, 
@@ -261,6 +262,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf_normal),
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, 
 							    uri, 
@@ -301,6 +303,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf),
+							    FALSE,
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
 							    mtime, 
 							    uri, 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-12-08 16:19:51 UTC (rev 16891)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-12-08 16:46:05 UTC (rev 16892)
@@ -96,7 +96,7 @@
 	if (hildon_thumbnail_outplugins_needs_out (target, mtime, uri)) {
 
 		hildon_thumbnail_outplugins_do_out (data, width, height,
-						    width*3, bpp/3,
+						    width*3, bpp/3, FALSE,
 						    target, mtime, uri, 
 						    &error);
 


More information about the maemo-commits mailing list