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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-03-09 13:05:05 +0200 (Mon, 09 Mar 2009)
New Revision: 17611

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
2009-03-09  Philip Van Hoof  <pvanhoof at codeminded.be>

        * daemon/plugins/gdkpixbuf-plugin.c
        * daemon/plugins/gstreamer-video-plugin.c
        * daemon/plugins/epeg-plugin.c: Checking for alpha-channels, fixes
        gray thumbnails Bug# 104113



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-03-09 10:58:03 UTC (rev 17610)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-03-09 11:05:05 UTC (rev 17611)
@@ -1,5 +1,12 @@
 2009-03-09  Philip Van Hoof  <pvanhoof at codeminded.be>
 
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/gstreamer-video-plugin.c
+	* daemon/plugins/epeg-plugin.c: Checking for alpha-channels, fixes
+	gray thumbnails Bug# 104113
+
+2009-03-09  Philip Van Hoof  <pvanhoof at codeminded.be>
+
 	* daemon/plugins/gstreamer-video-plugin.c: Added support for
 	video/quicktime (.mov files). Bugfix for Bug# 104293.
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2009-03-09 10:58:03 UTC (rev 17610)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2009-03-09 11:05:05 UTC (rev 17611)
@@ -233,8 +233,9 @@
 			hildon_thumbnail_outplugins_do_out (rgb8_pixels, 
 							    width,
 							    height,
-							    rowstride, 8,
-							    FALSE,
+							    rowstride, 
+							    gdk_pixbuf_get_bits_per_sample (pixbuf_large),
+							    gdk_pixbuf_get_has_alpha (pixbuf_large),
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, uri, 
 							    &nerror);
@@ -256,8 +257,9 @@
 			hildon_thumbnail_outplugins_do_out (rgb8_pixels, 
 							    width,
 							    height,
-							    rowstride, 8,
-							    FALSE,
+							    rowstride, 
+							    gdk_pixbuf_get_bits_per_sample (pixbuf_cropped),
+							    gdk_pixbuf_get_has_alpha (pixbuf_cropped),
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
 							    mtime, uri, 
 							    &nerror);
@@ -283,8 +285,9 @@
 			hildon_thumbnail_outplugins_do_out (rgb8_pixels, 
 							    width,
 							    height,
-							    rowstride, 8,
-							    FALSE,
+							    rowstride, 
+							    gdk_pixbuf_get_bits_per_sample (pixbuf_normal),
+							    gdk_pixbuf_get_has_alpha (pixbuf_normal),
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, uri, 
 							    &nerror);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-03-09 10:58:03 UTC (rev 17610)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-03-09 11:05:05 UTC (rev 17611)
@@ -222,7 +222,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf_large),
-							    FALSE,
+							    gdk_pixbuf_get_has_alpha (pixbuf_large),
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, 
 							    uri, 
@@ -262,7 +262,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf_normal),
-							    FALSE,
+							    gdk_pixbuf_get_has_alpha (pixbuf_normal),
 							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, 
 							    uri, 
@@ -303,7 +303,7 @@
 							    height,
 							    rowstride,
 							    gdk_pixbuf_get_bits_per_sample (pixbuf_cropped),
-							    FALSE,
+							    gdk_pixbuf_get_has_alpha (pixbuf_cropped),
 							    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	2009-03-09 10:58:03 UTC (rev 17610)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2009-03-09 11:05:05 UTC (rev 17611)
@@ -89,14 +89,14 @@
 #endif
 
 static gboolean
-create_output (HildonThumbnailPluginOutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime)
+create_output (HildonThumbnailPluginOutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime, gboolean alpha)
 {
 	GError *error = NULL;
 
 	if (hildon_thumbnail_outplugins_needs_out (target, mtime, uri)) {
 
 		hildon_thumbnail_outplugins_do_out (data, width, height,
-						    width*3, bpp/3, FALSE,
+						    width*3, bpp/3, alpha,
 						    target, mtime, uri, 
 						    &error);
 
@@ -121,7 +121,7 @@
 
 	create_output (thumber->target, data_photo,
 		       thumber->size, thumber->size,
-		       24, thumber->uri, thumber->mtime);
+		       24, thumber->uri, thumber->mtime, FALSE);
 
 	if (thumber->condition) {
 		g_mutex_lock (thumber->mutex);