GDK_INTERP_HYPER is deprecated

GDK_INTERP_HYPER is deprecated as GDK_INTERP_BILINEAR has a better
quality

diff --git a/doc/docbook/GuideOptionsGeneral.xml b/doc/docbook/GuideOptionsGeneral.xml
index 32ab40a..5fd6b22 100644 (file)
--- a/doc/docbook/GuideOptionsGeneral.xml
+++ b/doc/docbook/GuideOptionsGeneral.xml
@@ -47,14 +47,6 @@
                   <para>High quality results, moderately fast.</para>\r
                 </listitem>\r
               </varlistentry>\r
-              <varlistentry>\r
-                <term>\r
-                  <guilabel>Hyper</guilabel>\r
-                </term>\r
-                <listitem>\r
-                  <para>Slowest scaler, sometimes gives better results than bilinear.</para>\r
-                </listitem>\r
-              </varlistentry>\r
             </variablelist>\r
           </para>\r
         </listitem>\r

diff --git a/doc/docbook/GuideOptionsImage.xml b/doc/docbook/GuideOptionsImage.xml
index 0ef6dd3..ed44bea 100644 (file)
--- a/doc/docbook/GuideOptionsImage.xml
+++ b/doc/docbook/GuideOptionsImage.xml
@@ -37,14 +37,6 @@
                   <para>High quality results, moderately fast.</para>\r
                 </listitem>\r
               </varlistentry>\r
-              <varlistentry>\r
-                <term>\r
-                  <guilabel>Hyper</guilabel>\r
-                </term>\r
-                <listitem>\r
-                  <para>Slowest scaler, sometimes gives better results than bilinear.</para>\r
-                </listitem>\r
-              </varlistentry>\r
             </variablelist>\r
           </para>\r
         </listitem>\r

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 4693943..f61aa4a 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -213,7 +213,7 @@ static void pixbuf_renderer_class_init(PixbufRendererClass *class)
                                                          "Zoom quality",
                                                          NULL,
                                                          GDK_INTERP_NEAREST,
-                                                         GDK_INTERP_HYPER,
+                                                         GDK_INTERP_BILINEAR,
                                                          GDK_INTERP_BILINEAR,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));
 

diff --git a/src/preferences.c b/src/preferences.c
index 41bdc72..4d223cf 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -550,9 +550,6 @@ static void quality_menu_cb(GtkWidget *combo, gpointer data)
                case 2:
                        *option = GDK_INTERP_BILINEAR;
                        break;
-               case 3:
-                       *option = GDK_INTERP_HYPER;
-                       break;
                }
 }
 
@@ -606,10 +603,8 @@ static void add_quality_menu(GtkWidget *table, gint column, gint row, const gcha
        if (option == GDK_INTERP_NEAREST) current = 0;
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Tiles"));
        if (option == GDK_INTERP_TILES) current = 1;
-       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Bilinear"));
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Bilinear (best, but slowest)"));
        if (option == GDK_INTERP_BILINEAR) current = 2;
-       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Hyper (best, but slowest)"));
-       if (option == GDK_INTERP_HYPER) current = 3;
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), current);
 

diff --git a/src/print.c b/src/print.c
index 60fea21..dbdf031 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -36,7 +36,7 @@
 #define PRINT_TEXT_PADDING 3.0
 
 /* method to use when scaling down image data */
-#define PRINT_MAX_INTERP GDK_INTERP_HYPER
+#define PRINT_MAX_INTERP GDK_INTERP_BILINEAR
 
 /* reverse order is important */
 typedef enum {

diff --git a/src/rcfile.c b/src/rcfile.c
index 4a7497d..2ae6873 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -800,7 +800,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_UINT_CLAMP(*options, image.scroll_reset_method, 0, PR_SCROLL_RESET_COUNT - 1)) continue;
                if (READ_INT(*options, image.tile_cache_max)) continue;
                if (READ_INT(*options, image.image_cache_max)) continue;
-               if (READ_UINT_CLAMP(*options, image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
+               if (READ_UINT_CLAMP(*options, image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_BILINEAR)) continue;
                if (READ_INT(*options, image.zoom_increment)) continue;
                if (READ_BOOL(*options, image.enable_read_ahead)) continue;
                if (READ_BOOL(*options, image.exif_rotate_enable)) continue;
@@ -819,7 +819,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, thumbnails.cache_into_dirs)) continue;
                if (READ_BOOL(*options, thumbnails.use_xvpics)) continue;
                if (READ_BOOL(*options, thumbnails.spec_standard)) continue;
-               if (READ_UINT_CLAMP(*options, thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
+               if (READ_UINT_CLAMP(*options, thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_BILINEAR)) continue;
                if (READ_BOOL(*options, thumbnails.use_exif)) continue;
                if (READ_INT(*options, thumbnails.collection_preview)) continue;
                if (READ_BOOL(*options, thumbnails.use_ft_metadata)) continue;

diff --git a/src/renderer-clutter.c b/src/renderer-clutter.c
index f379130..b67e342 100644 (file)
--- a/src/renderer-clutter.c
+++ b/src/renderer-clutter.c
@@ -405,7 +405,7 @@ static void update_display_pixbuf(RendererClutter *rc)
                                rc->display_pixbuf = gdk_pixbuf_composite_color_simple (tmppixbuf,
                                                gdk_pixbuf_get_width(pr->pixbuf),
                                                gdk_pixbuf_get_height(pr->pixbuf),
-                                               GDK_INTERP_HYPER,
+                                               GDK_INTERP_BILINEAR,
                                                255,
                                                PR_ALPHA_CHECK_SIZE,
                                                ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
@@ -421,7 +421,7 @@ static void update_display_pixbuf(RendererClutter *rc)
                                rc->display_pixbuf = gdk_pixbuf_composite_color_simple (pr->pixbuf,
                                                gdk_pixbuf_get_width(pr->pixbuf),
                                                gdk_pixbuf_get_height(pr->pixbuf),
-                                               GDK_INTERP_HYPER,
+                                               GDK_INTERP_BILINEAR,
                                                255,
                                                PR_ALPHA_CHECK_SIZE,
                                                ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +