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 0c6b533..0995ad0 100644
--- a/demos/scale.c
+++ b/demos/scale.c
@@ -127,13 +127,6 @@
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 @@
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 @@
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 7e999c1..d498d26 100644
--- a/demos/scale.ui
+++ b/demos/scale.ui
@@ -192,23 +192,12 @@
<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"><b>Filter:</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- <child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes"><b>Reconstruct X:</b></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>
