Bladeren bron

Make padding properties more similar to ufo-filters

Tomas Farago 9 jaren geleden
bovenliggende
commit
928bd4ffed
1 gewijzigde bestanden met toevoegingen van 19 en 19 verwijderingen
  1. 19 19
      src/ufo-anka-padding-task.c

+ 19 - 19
src/ufo-anka-padding-task.c

@@ -39,7 +39,7 @@ struct _UfoAnkaPaddingTaskPrivate {
     cl_sampler sampler;
 
     /* properties */
-    guint width, height, x_0, y_0;
+    guint width, height, x, y;
     cl_addressing_mode addressing_mode;
 };
 
@@ -55,8 +55,8 @@ enum {
     PROP_0,
     PROP_WIDTH,
     PROP_HEIGHT,
-    PROP_X_0,
-    PROP_Y_0,
+    PROP_X,
+    PROP_Y,
     PROP_ADDRESSING_MODE,
     N_PROPERTIES
 };
@@ -195,8 +195,8 @@ ufo_anka_padding_task_process (UfoTask *task,
     input_shape[0] = in_req.dims[0];
     input_shape[1] = in_req.dims[1];
 
-    offset[0] = priv->x_0;
-    offset[1] = priv->y_0;
+    offset[0] = priv->x;
+    offset[1] = priv->y;
 
     in_image = ufo_buffer_get_device_image (inputs[0], cmd_queue);
 
@@ -227,11 +227,11 @@ ufo_anka_padding_task_set_property (GObject *object,
         case PROP_HEIGHT:
             priv->height = g_value_get_uint (value);
             break;
-        case PROP_X_0:
-            priv->x_0 = g_value_get_uint (value);
+        case PROP_X:
+            priv->x = g_value_get_uint (value);
             break;
-        case PROP_Y_0:
-            priv->y_0 = g_value_get_uint (value);
+        case PROP_Y:
+            priv->y = g_value_get_uint (value);
             break;
         case PROP_ADDRESSING_MODE:
             if (!g_strcmp0 (g_value_get_string (value), "none")) {
@@ -275,11 +275,11 @@ ufo_anka_padding_task_get_property (GObject *object,
         case PROP_HEIGHT:
             g_value_set_uint (value, priv->height);
             break;
-        case PROP_X_0:
-            g_value_set_uint (value, priv->x_0);
+        case PROP_X:
+            g_value_set_uint (value, priv->x);
             break;
-        case PROP_Y_0:
-            g_value_set_uint (value, priv->y_0);
+        case PROP_Y:
+            g_value_set_uint (value, priv->y);
             break;
         case PROP_ADDRESSING_MODE:
             switch (priv->addressing_mode) {
@@ -361,15 +361,15 @@ ufo_anka_padding_task_class_init (UfoAnkaPaddingTaskClass *klass)
                            0, +8192, 0,
                            G_PARAM_READWRITE);
 
-    properties[PROP_X_0] =
-        g_param_spec_uint ("x-0",
+    properties[PROP_X] =
+        g_param_spec_uint ("x",
                            "X start index",
                            "X index for input's 0th column",
                            0, +8192, 0,
                            G_PARAM_READWRITE);
 
-    properties[PROP_Y_0] =
-        g_param_spec_uint ("y-0",
+    properties[PROP_Y] =
+        g_param_spec_uint ("y",
                            "Y start index",
                            "Y index for input's 0th row",
                            0, +8192, 0,
@@ -397,7 +397,7 @@ ufo_anka_padding_task_init(UfoAnkaPaddingTask *self)
 
     self->priv->width = 0;
     self->priv->height = 0;
-    self->priv->x_0 = 0;
-    self->priv->y_0 = 0;
+    self->priv->x = 0;
+    self->priv->y = 0;
     self->priv->addressing_mode = CL_ADDRESS_CLAMP;
 }