From 39a4b032de2258efb31de5e378defa1282704894 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 3 Jan 2020 18:02:35 +0100 Subject: fm-properties: Remove use of mate-desktop-thumbnail helper don't use mate_desktop_thumbnail_scale_down_pixbuf(). gdk-pixbuf doesn't have the same bugs when shrinking images by large factors. --- configure.ac | 3 +++ src/file-manager/fm-properties-window.c | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b2ca8776..345cb9eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ AC_PREREQ(2.54) dnl =========================================================================== +m4_define(gdk-pixbuf_minver, 2.36.5) m4_define(glib_minver, 2.50.0) m4_define(gio_minver, 2.50.0) m4_define(mate_desktop_minver, 1.17.3) @@ -33,6 +34,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) +AC_SUBST(GDKPIXBUF_REQUIRED, [gdk-pixbuf_minver]) AC_SUBST(GLIB_REQUIRED, [glib_minver]) AC_SUBST(GIO_REQUIRED, [gio_minver]) AC_SUBST(MATE_DESKTOP_REQUIRED, [mate_desktop_minver]) @@ -63,6 +65,7 @@ fi AC_CHECK_LIB(m, floor) PKG_CHECK_MODULES(ALL, [ + gdk-pixbuf-2.0 >= gdk-pixbuf_minver glib-2.0 >= glib_minver mate-desktop-2.0 >= mate_desktop_minver gthread-2.0 diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 03592589..75784811 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -31,9 +31,6 @@ #include #include -#define MATE_DESKTOP_USE_UNSTABLE_API -#include - #include "../../eel/eel-accessibility.h" #include "../../eel/eel-gdk-pixbuf-extensions.h" #include "../../eel/eel-glib-extensions.h" @@ -5677,10 +5674,11 @@ update_preview_callback (GtkFileChooser *icon_chooser, scale = (double)gdk_pixbuf_get_height (pixbuf) / gdk_pixbuf_get_width (pixbuf); - scaled_pixbuf = mate_desktop_thumbnail_scale_down_pixbuf + scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, PREVIEW_IMAGE_WIDTH, - scale * PREVIEW_IMAGE_WIDTH); + scale * PREVIEW_IMAGE_WIDTH, + GDK_INTERP_HYPER); g_object_unref (pixbuf); pixbuf = scaled_pixbuf; } -- cgit v1.2.1