[gegl] seamless-clone ops: move to gegl-op.h
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] seamless-clone ops: move to gegl-op.h
- Date: Tue, 20 May 2014 20:34:24 +0000 (UTC)
commit ba2f392a54a278621937c31c74e81847b15c6fe7
Author: Øyvind Kolås <pippin gimp org>
Date: Tue May 20 22:34:01 2014 +0200
seamless-clone ops: move to gegl-op.h
operations/seamless-clone/seamless-clone-compose.c | 33 +++++++----
operations/seamless-clone/seamless-clone.c | 56 ++++++++++++--------
2 files changed, 54 insertions(+), 35 deletions(-)
---
diff --git a/operations/seamless-clone/seamless-clone-compose.c
b/operations/seamless-clone/seamless-clone-compose.c
index 297856e..15a3a43 100644
--- a/operations/seamless-clone/seamless-clone-compose.c
+++ b/operations/seamless-clone/seamless-clone-compose.c
@@ -17,25 +17,34 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef GEGL_CHANT_PROPERTIES
-gegl_chant_int (max_refine_steps, _("Refinement Steps"), 0, 100000.0, 2000,
- _("Maximal amount of refinement points to be used for the interpolation mesh"))
+#ifdef GEGL_PROPERTIES
+property_int (max_refine_steps, _("Refinement Steps"), 2000)
+ description(_("Maximal amount of refinement points to be used for the interpolation mesh"))
+ value_range (0, 100000)
-gegl_chant_int (xoff, _("X offset"), -100000, 100000, 0,
- _("How much horizontal offset should applied to the paste"))
+property_int (xoff, _("X offset"), 0)
+ description (_("How much horizontal offset should applied to the paste"))
+ value_range (0, 100000)
+ ui_meta ("axis", "x")
+ ui_meta ("unit", "pixel-coordinate")
-gegl_chant_int (yoff, _("Y offset"), -100000, 100000, 0,
- _("How much vertical offset should applied to the paste"))
+property_int (yoff, _("Y offset"), 0)
+ description(_("How much vertical offset should applied to the paste"))
+ value_range (0, 100000)
+ ui_meta ("axis", "y")
+ ui_meta ("unit", "pixel-coordinate")
+
+property_string (error_msg, _("Error message"), "")
+ description (_("An error message in case of a failure"))
-gegl_chant_string (error_msg, _("Error message"), "", _("An error message in case of a failure"))
#else
-#define GEGL_CHANT_TYPE_META
-#define GEGL_CHANT_C_FILE "seamless-clone-compose.c"
+#define GEGL_OP_META
+#define GEGL_OP_C_FILE "seamless-clone-compose.c"
#include "config.h"
#include <glib/gi18n-lib.h>
-#include "gegl-chant.h"
+#include "gegl-op.h"
static void
attach (GeglOperation *operation)
@@ -81,7 +90,7 @@ attach (GeglOperation *operation)
}
static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
{
GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
diff --git a/operations/seamless-clone/seamless-clone.c b/operations/seamless-clone/seamless-clone.c
index aa5a4f6..9692391 100644
--- a/operations/seamless-clone/seamless-clone.c
+++ b/operations/seamless-clone/seamless-clone.c
@@ -17,25 +17,35 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef GEGL_CHANT_PROPERTIES
-gegl_chant_int (max_refine_steps, _("Refinement Steps"), 0, 100000.0, 2000,
- _("Maximal amount of refinement points to be used for the interpolation mesh"))
+#ifdef GEGL_PROPERTIES
-gegl_chant_int (xoff, _("X offset"), -100000, 100000, 0,
- _("How much horizontal offset should applied to the paste"))
+property_int (max_refine_steps, _("Refinement Steps"), 2000)
+ description (_("Maximal amount of refinement points to be used for the interpolation mesh"))
+ value_range (0, 100000)
-gegl_chant_int (yoff, _("Y offset"), -100000, 100000, 0,
- _("How much vertical offset should applied to the paste"))
+property_int (xoff, _("X offset"), 0)
+ description (_("How much horizontal offset should applied to the paste"))
+ value_range (-100000, 100000)
+ ui_meta ("unit", "pixel-coordinate")
+ ui_meta ("axis", "x")
+
+property_int (yoff, _("Y offset"), 0)
+ description (_("How much horizontal offset should applied to the paste"))
+ value_range (-100000, 100000)
+ ui_meta ("unit", "pixel-coordinate")
+ ui_meta ("axis", "y")
+
+property_string (error_msg, _("Error message"), "")
+ description (_("An error message in case of a failure"))
-gegl_chant_string (error_msg, _("Error message"), "", _("An error message in case of a failure"))
#else
-#define GEGL_CHANT_TYPE_COMPOSER
-#define GEGL_CHANT_C_FILE "seamless-clone.c"
+#define GEGL_OP_COMPOSER
+#define GEGL_OP_C_FILE "seamless-clone.c"
#include "config.h"
#include <glib/gi18n-lib.h>
-#include "gegl-chant.h"
+#include "gegl-op.h"
#include "sc-context.h"
#include "sc-common.h"
@@ -79,17 +89,17 @@ static void
prepare (GeglOperation *operation)
{
const Babl *format = babl_format (GEGL_SC_COLOR_BABL_NAME);
- GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
+ GeglProperties *o = GEGL_PROPERTIES (operation);
SCProps *props;
- if ((props = (SCProps*) o->chant_data) == NULL)
+ if ((props = (SCProps*) o->user_data) == NULL)
{
props = g_slice_new (SCProps);
g_mutex_init (&props->mutex);
props->first_processing = TRUE;
props->is_valid = FALSE;
props->context = NULL;
- o->chant_data = props;
+ o->user_data = props;
}
props->first_processing = TRUE;
props->is_valid = FALSE;
@@ -101,17 +111,17 @@ prepare (GeglOperation *operation)
static void finalize (GObject *object)
{
GeglOperation *op = (void*) object;
- GeglChantO *o = GEGL_CHANT_PROPERTIES (op);
- if (o->chant_data)
+ GeglProperties *o = GEGL_PROPERTIES (op);
+ if (o->user_data)
{
- SCProps *props = (SCProps*) o->chant_data;
+ SCProps *props = (SCProps*) o->user_data;
g_mutex_clear (&props->mutex);
if (props->context)
gegl_sc_context_free (props->context);
g_slice_free (SCProps, props);
- o->chant_data = NULL;
+ o->user_data = NULL;
}
- G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gegl_op_parent_class)->finalize (object);
}
static gboolean
@@ -123,12 +133,12 @@ process (GeglOperation *operation,
gint level)
{
gboolean return_val;
- GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
+ GeglProperties *o = GEGL_PROPERTIES (operation);
SCProps *props;
GeglScCreationError error;
GeglScRenderInfo info;
- g_assert (o->chant_data != NULL);
+ g_assert (o->user_data != NULL);
info.bg = input;
info.bg_rect = *gegl_operation_source_get_bounding_box (operation, "input");
@@ -138,7 +148,7 @@ process (GeglOperation *operation,
info.yoff = o->yoff;
info.render_bg = FALSE;
- props = (SCProps*) o->chant_data;
+ props = (SCProps*) o->user_data;
g_mutex_lock (&props->mutex);
if (props->first_processing)
@@ -195,7 +205,7 @@ process (GeglOperation *operation,
}
static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
{
GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
GeglOperationComposerClass *composer_class = GEGL_OPERATION_COMPOSER_CLASS (klass);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]