Revert "demos/scale: Added pulldown to choose PIXMAN_FILTER_* value"

This reverts commit 375f5ec5c5d2a6cc3586f57e36fdf08a3d0ac4e4.

This patch was accidentally pushed.

diff --git a/demos/scale.c b/demos/scale.c
index 0c6b533fadfca7fdecb95bfd5601d18ef7a867ac..0995ad08da9d8b19d09ac953c9f395943693ce3f 100644 (file)
--- a/demos/scale.c
+++ b/demos/scale.c
@@ -127,13 +127,6 @@ typedef struct
     int                value;
 } named_int_t;
 
-static const named_int_t filter_types[] =
-{
-    { "Separable",             PIXMAN_FILTER_SEPARABLE_CONVOLUTION },
-    { "Nearest",               PIXMAN_FILTER_NEAREST },
-    { "Bilinear",              PIXMAN_FILTER_BILINEAR },
-};
-
 static const named_int_t filters[] =
 {
     { "Box",                   PIXMAN_KERNEL_BOX },
@@ -256,29 +249,18 @@ rescale (GtkWidget *may_be_null, app_t *app)
     pixman_transform_from_pixman_f_transform (&transform, &ftransform);
     pixman_image_set_transform (app->original, &transform);
 
-    if (get_value (app, filter_types, "filter_combo_box") ==
-       PIXMAN_FILTER_SEPARABLE_CONVOLUTION)
-    {
-       params = pixman_filter_create_separable_convolution (
-           &n_params,
-           sx * 65536.0 + 0.5,
-           sy * 65536.0 + 0.5,
-           get_value (app, filters, "reconstruct_x_combo_box"),
-           get_value (app, filters, "reconstruct_y_combo_box"),
-           get_value (app, filters, "sample_x_combo_box"),
-           get_value (app, filters, "sample_y_combo_box"),
-           gtk_adjustment_get_value (app->subsample_adjustment),
-           gtk_adjustment_get_value (app->subsample_adjustment));
-    }
-    else
-    {
-       params = 0;
-       n_params = 0;
-    }
+    params = pixman_filter_create_separable_convolution (
+        &n_params,
+        sx * 65536.0 + 0.5,
+       sy * 65536.0 + 0.5,
+       get_value (app, filters, "reconstruct_x_combo_box"),
+       get_value (app, filters, "reconstruct_y_combo_box"),
+       get_value (app, filters, "sample_x_combo_box"),
+       get_value (app, filters, "sample_y_combo_box"),
+       gtk_adjustment_get_value (app->subsample_adjustment),
+       gtk_adjustment_get_value (app->subsample_adjustment));
 
-    pixman_image_set_filter (app->original,
-       get_value (app, filter_types, "filter_combo_box"),
-       params, n_params);
+    pixman_image_set_filter (app->original, PIXMAN_FILTER_SEPARABLE_CONVOLUTION, params, n_params);
 
     pixman_image_set_repeat (
         app->original, get_value (app, repeats, "repeat_combo_box"));
@@ -420,7 +402,6 @@ 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_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");

diff --git a/demos/scale.ui b/demos/scale.ui
index 7e999c1ff86d76665e4b4d2cc0bf63b30ccbedab..d498d26e8c9b3d2f2329ccb2201d84b0ea9ff4fe 100644 (file)
--- a/demos/scale.ui
+++ b/demos/scale.ui
@@ -191,14 +191,6 @@
                     <property name="visible">True</property>
                     <property name="column_spacing">8</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="labelF">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Filter:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
@@ -206,9 +198,6 @@
                         <property name="label" translatable="yes">&lt;b&gt;Reconstruct X:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label5">
@@ -218,7 +207,7 @@
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -229,7 +218,7 @@
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -240,7 +229,7 @@
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
@@ -251,7 +240,7 @@
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">4</property>
                       </packing>
                     </child>
                     <child>
@@ -262,15 +251,7 @@
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="top_attach">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="filter_combo_box">
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
@@ -279,7 +260,6 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -288,7 +268,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -297,7 +277,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -306,7 +286,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
@@ -315,7 +295,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">4</property>
                       </packing>
                     </child>
                     <child>
@@ -326,7 +306,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                   </object>