[Pixman] [PATCH v14 22/22] demos/scale: Add good/best filter types

[spitzak at gmail.com]

From: Bill Spitzak <spitzak at gmail.com>

Allows testing them. Good is the default to match default behavior of
pixman/cairo at startup.

v14: Locked axis put in it's own commit

Signed-off-by: Bill Spitzak <spitzak at gmail.com>
---
 demos/scale.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/demos/scale.c b/demos/scale.c
index 0c6b533..d1fce5d 100644
--- a/demos/scale.c
+++ b/demos/scale.c
@@ -132,6 +132,8 @@ static const named_int_t filter_types[] =
     { "Separable",		PIXMAN_FILTER_SEPARABLE_CONVOLUTION },
     { "Nearest",		PIXMAN_FILTER_NEAREST },
     { "Bilinear",		PIXMAN_FILTER_BILINEAR },
+    { "Good",			PIXMAN_FILTER_GOOD },
+    { "Best",			PIXMAN_FILTER_BEST },
 };
 
 static const named_int_t filters[] =
@@ -338,7 +340,7 @@ on_expose (GtkWidget *da, GdkEvent *event, gpointer data)
 
 static void
 set_up_combo_box (app_t *app, const char *box_name,
-                  int n_entries, const named_int_t table[])
+                  int n_entries, const named_int_t table[], int active)
 {
     GtkWidget *widget = get_widget (app, box_name);
     GtkListStore *model;
@@ -364,7 +366,7 @@ set_up_combo_box (app_t *app, const char *box_name,
 	gtk_list_store_set (model, &iter, 0, info->name, -1);
     }
 
-    gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+    gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active);
 
     g_signal_connect (widget, "changed", G_CALLBACK (rescale), app);
 }
@@ -372,7 +374,7 @@ set_up_combo_box (app_t *app, const char *box_name,
 static void
 set_up_filter_box (app_t *app, const char *box_name)
 {
-    set_up_combo_box (app, box_name, G_N_ELEMENTS (filters), filters);
+    set_up_combo_box (app, box_name, G_N_ELEMENTS (filters), filters, 0);
 }
 
 static char *
@@ -420,14 +422,14 @@ app_new (pixman_image_t *original)
     widget = get_widget (app, "drawing_area");
     g_signal_connect (widget, "expose_event", G_CALLBACK (on_expose), app);
 
-    set_up_combo_box (app, "filter_combo_box", G_N_ELEMENTS (filter_types), filter_types);
+    set_up_combo_box (app, "filter_combo_box", G_N_ELEMENTS (filter_types), filter_types, 3);
     set_up_filter_box (app, "reconstruct_x_combo_box");
     set_up_filter_box (app, "reconstruct_y_combo_box");
     set_up_filter_box (app, "sample_x_combo_box");
     set_up_filter_box (app, "sample_y_combo_box");
 
     set_up_combo_box (
-        app, "repeat_combo_box", G_N_ELEMENTS (repeats), repeats);
+	app, "repeat_combo_box", G_N_ELEMENTS (repeats), repeats, 0);
 
     g_signal_connect (
 	gtk_builder_get_object (app->builder, "lock_checkbutton"),
-- 
1.9.1