nautilus r13779 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Wed Feb 20 09:23:15 2008
New Revision: 13779
URL: http://svn.gnome.org/viewvc/nautilus?rev=13779&view=rev

Log:
2008-02-20  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-icon-info.c:
        (nautilus_icon_info_get_pixbuf_nodefault_at_size):
        (nautilus_icon_info_get_pixbuf_at_size):
	Don't scale icons if not needed (#515903)
	Patch from Christian Neumair




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-info.c

Modified: trunk/libnautilus-private/nautilus-icon-info.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-info.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-info.c	Wed Feb 20 09:23:15 2008
@@ -487,6 +487,10 @@
 	w = gdk_pixbuf_get_width (pixbuf);
 	h = gdk_pixbuf_get_height (pixbuf);
 	s = MAX (w, h);
+	if (s == forced_size) {
+		return pixbuf;
+	}
+
 	scale = (double)forced_size / s;
 	scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
 						 w * scale, h * scale,
@@ -509,6 +513,10 @@
 	w = gdk_pixbuf_get_width (pixbuf);
 	h = gdk_pixbuf_get_height (pixbuf);
 	s = MAX (w, h);
+	if (s == forced_size) {
+		return pixbuf;
+	}
+
 	scale = (double)forced_size / s;
 	scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
 						 w * scale, h * scale,