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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-06-08 16:57:04 +0300 (Mon, 08 Jun 2009)
New Revision: 18660

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/pixbuf-io-loader.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2009-06-08  Philip Van Hoof  <philip at codeminded.be>

        * thumbs/hildon-thumbnail-obj.c
        * daemon/plugins/gdkpixbuf-plugin.c
        * daemon/plugins/pixbuf-io-loader.c: Ensure that we use our own pixbuf loaders



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-06-08 12:53:29 UTC (rev 18659)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-06-08 13:57:04 UTC (rev 18660)
@@ -1,3 +1,9 @@
+2009-06-08  Philip Van Hoof  <philip at codeminded.be>
+
+	* thumbs/hildon-thumbnail-obj.c
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/pixbuf-io-loader.c: Ensure that we use our own pixbuf loaders
+
 2009-06-08  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.31

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-06-08 12:53:29 UTC (rev 18659)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-06-08 13:57:04 UTC (rev 18660)
@@ -45,20 +45,7 @@
 
 #include <hildon-thumbnail-plugin.h>
 
-#ifndef gdk_pixbuf_new_from_stream_at_scale
-/* It's implemented in pixbuf-io-loader.c in this case */
-GdkPixbuf* gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream, gint width,
-			gint height, gboolean preserve_aspect_ratio,
-			GCancellable *cancellable, GError **error);
-#endif
 
-#ifndef gdk_pixbuf_new_from_stream
-/* It's implemented in pixbuf-io-loader.c in this case */
-GdkPixbuf * gdk_pixbuf_new_from_stream (GInputStream  *stream,
-			    GCancellable  *cancellable,
-			    GError       **error);
-#endif 
-
 static gchar **supported = NULL;
 static gboolean do_cropped = TRUE;
 static GFileMonitor *monitor = NULL;
@@ -146,7 +133,7 @@
 #ifdef LARGE_THUMBNAILS
 		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uri, &err_file)) {
 
-			GdkPixbuf *pixbuf_large1 = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
+			GdkPixbuf *pixbuf_large1 = my_gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
 									    256, 256,
 									    TRUE,
 									    NULL,
@@ -195,7 +182,7 @@
 
 		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uri, &err_file)) {
 
-			GdkPixbuf *pixbuf_normal1 = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
+			GdkPixbuf *pixbuf_normal1 = my_gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
 									     128, 128,
 									     TRUE,
 									     NULL,
@@ -242,7 +229,7 @@
 
 		if (do_cropped && hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uri, &err_file)) {
 
-			GdkPixbuf *pixbuf1 = gdk_pixbuf_new_from_stream (G_INPUT_STREAM (stream),
+			GdkPixbuf *pixbuf1 = my_gdk_pixbuf_new_from_stream (G_INPUT_STREAM (stream),
 							     NULL,
 							     &nerror);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/pixbuf-io-loader.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/pixbuf-io-loader.c	2009-06-08 12:53:29 UTC (rev 18659)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/pixbuf-io-loader.c	2009-06-08 13:57:04 UTC (rev 18660)
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifndef gdk_pixbuf_new_from_stream_at_scale
 
 #define LOAD_BUFFER_SIZE 65536
 
@@ -134,7 +133,7 @@
 }
 
 /**
- * gdk_pixbuf_new_from_stream_at_scale:
+ * my_gdk_pixbuf_new_from_stream_at_scale:
  * @stream:  a #GInputStream to load the pixbuf from
  * @width: The width the image should have or -1 to not constrain the width
  * @height: The height the image should have or -1 to not constrain the height
@@ -167,7 +166,7 @@
  * Since: 2.14
  */
 GdkPixbuf *
-gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
+my_gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
 				     gint	    width,
 				     gint 	    height,
 				     gboolean       preserve_aspect_ratio,
@@ -194,7 +193,7 @@
 }
 
 /**
- * gdk_pixbuf_new_from_stream:
+ * my_gdk_pixbuf_new_from_stream:
  * @stream:  a #GInputStream to load the pixbuf from
  * @cancellable: optional #GCancellable object, %NULL to ignore
  * @error: Return location for an error
@@ -217,7 +216,7 @@
  * Since: 2.14
  **/
 GdkPixbuf *
-gdk_pixbuf_new_from_stream (GInputStream  *stream,
+my_gdk_pixbuf_new_from_stream (GInputStream  *stream,
 			    GCancellable  *cancellable,
 			    GError       **error)
 {
@@ -231,5 +230,4 @@
 	return pixbuf;
 }
 
-#endif
 

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-06-08 12:53:29 UTC (rev 18659)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-06-08 13:57:04 UTC (rev 18660)
@@ -58,24 +58,6 @@
 } HildonThumbnailFactoryPrivate;
 
 
-#ifndef gdk_pixbuf_new_from_stream
-/* It's implemented in pixbuf-io-loader.c in this case */
-GdkPixbuf * gdk_pixbuf_new_from_stream (GInputStream  *stream,
-			    GCancellable  *cancellable,
-			    GError       **error);
-#endif 
-
-#ifndef gdk_pixbuf_new_from_stream_at_scale
-/* It's implemented in pixbuf-io-loader.c in this case */
-GdkPixbuf *
-gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
-				     gint	    width,
-				     gint 	    height,
-				     gboolean       preserve_aspect_ratio,
-				     GCancellable  *cancellable,
-		  	    	     GError       **error);
-#endif
-
 #define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail"
 #define FACTORY_ERROR g_quark_from_static_string (HILDON_THUMBNAIL_APPLICATION)
 
@@ -186,7 +168,7 @@
 
 		if (!error) {
 			/* Read the stream as a pixbuf at the requested exact scale */
-			pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
+			pixbuf = my_gdk_pixbuf_new_from_stream_at_scale (stream,
 				r_priv->width, r_priv->height, TRUE, 
 				NULL, &error);
 		}