diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index cdcdbeba3e580fc920c9d56cdc3591651877f3ac..8f63a6d64b1d3d905d1c5dfe282719ca183b7599 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,3 +1,11 @@ +2000-02-04 John Sullivan + + * libnautilus/nautilus-icon-factory.c: + (nautilus_icon_factory_scale): Changed back to ART_FILTER_BILINEAR + once again after jrb & federico both pointed out that the + black-scaled-icons problem should be fixed (and was) in the latest + gdk-pixbuf. + 2000-02-03 Andy Hertzfeld * src/nautilus-zoom-control.c: diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c index 944ad5c8edb4feb0bd4755c690eb298e75483942..3861ccd6f0827cb346076abd9524b47de42fe7a2 100644 --- a/libnautilus-extensions/nautilus-icon-factory.c +++ b/libnautilus-extensions/nautilus-icon-factory.c @@ -543,15 +543,11 @@ nautilus_icon_factory_scale (NautilusIconFactory *factory, new_width = (old_width * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; new_height = (old_height * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; - /* This creates scaled icon with ref. count of 1. - * Use ART_FILTER_NEAREST because others such as ART_FILTER_BILINEAR - * cause scaled icons used as pixmaps/masks (e.g. in list view) to - * appear nearly black. - */ + /* This creates scaled icon with ref. count of 1. */ result = gdk_pixbuf_scale_simple (standard_sized_pixbuf, new_width, new_height, - ART_FILTER_NEAREST); + ART_FILTER_BILINEAR); return result; } diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 944ad5c8edb4feb0bd4755c690eb298e75483942..3861ccd6f0827cb346076abd9524b47de42fe7a2 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -543,15 +543,11 @@ nautilus_icon_factory_scale (NautilusIconFactory *factory, new_width = (old_width * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; new_height = (old_height * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; - /* This creates scaled icon with ref. count of 1. - * Use ART_FILTER_NEAREST because others such as ART_FILTER_BILINEAR - * cause scaled icons used as pixmaps/masks (e.g. in list view) to - * appear nearly black. - */ + /* This creates scaled icon with ref. count of 1. */ result = gdk_pixbuf_scale_simple (standard_sized_pixbuf, new_width, new_height, - ART_FILTER_NEAREST); + ART_FILTER_BILINEAR); return result; } diff --git a/libnautilus/nautilus-icon-factory.c b/libnautilus/nautilus-icon-factory.c index 944ad5c8edb4feb0bd4755c690eb298e75483942..3861ccd6f0827cb346076abd9524b47de42fe7a2 100644 --- a/libnautilus/nautilus-icon-factory.c +++ b/libnautilus/nautilus-icon-factory.c @@ -543,15 +543,11 @@ nautilus_icon_factory_scale (NautilusIconFactory *factory, new_width = (old_width * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; new_height = (old_height * size_in_pixels) / NAUTILUS_ICON_SIZE_STANDARD; - /* This creates scaled icon with ref. count of 1. - * Use ART_FILTER_NEAREST because others such as ART_FILTER_BILINEAR - * cause scaled icons used as pixmaps/masks (e.g. in list view) to - * appear nearly black. - */ + /* This creates scaled icon with ref. count of 1. */ result = gdk_pixbuf_scale_simple (standard_sized_pixbuf, new_width, new_height, - ART_FILTER_NEAREST); + ART_FILTER_BILINEAR); return result; }