gegl r1828 - in trunk: . operations/core
- From: ok svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r1828 - in trunk: . operations/core
- Date: Tue, 8 Jan 2008 01:04:33 +0000 (GMT)
Author: ok
Date: Tue Jan 8 01:04:33 2008
New Revision: 1828
URL: http://svn.gnome.org/viewvc/gegl?rev=1828&view=rev
Log:
* operations/core/crop.c: turned into a non chanted operation that
derives directly from GeglOperation instead of GeglOperationFilter.
Modified:
trunk/ChangeLog
trunk/operations/core/crop.c
Modified: trunk/operations/core/crop.c
==============================================================================
--- trunk/operations/core/crop.c (original)
+++ trunk/operations/core/crop.c Tue Jan 8 01:04:33 2008
@@ -1,4 +1,4 @@
-/* This file is an image processing operation for GEGL
+/* This file is part of GEGL
*
* GEGL is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -13,76 +13,331 @@
* You should have received a copy of the GNU Lesser General Public
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
- * Copyright 2006 Ãyvind KolÃs <pippin gimp org>
+ * Copyright 2006 Ãyvind KolÃs
*/
-#if GEGL_CHANT_PROPERTIES
-gegl_chant_double (x, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
- "Left-most pixel coordinate.")
-gegl_chant_double (y, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
- "Top-most pixel coordinate.")
-gegl_chant_double (width, -G_MAXDOUBLE, G_MAXDOUBLE, 10.0,
- "Width in pixels.")
-gegl_chant_double (height, -G_MAXDOUBLE, G_MAXDOUBLE, 10.0,
- "Height in pixels.")
+#ifndef __GEGL_OPERATION_CROP_H__
+#define __GEGL_OPERATION_CROP_H__
-#else
+#include "operation/gegl-operation.h"
+#include "gegl-utils.h"
+#include "gegl-module.h"
-#define GEGL_CHANT_FILTER
-#define GEGL_CHANT_NAME crop
-#define GEGL_CHANT_SELF "crop.c"
-#define GEGL_CHANT_DESCRIPTION "Crops the resulting image buffer computed by the sources of the crop operation, can be used to mask out unwanted data, the cropped out regions are interpreted as transparent black by nodes using regions outside the crop-area for compositing."
-#define GEGL_CHANT_CATEGORIES "misc"
-#define GEGL_CHANT_CLASS_INIT
-#include "gegl-chant.h"
+G_BEGIN_DECLS
-#include <stdio.h>
+#define GEGL_TYPE_OPERATION_CROP (gegl_operation_crop_get_type ())
+#define GEGL_OPERATION_CROP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_CROP, GeglOperationCrop))
+#define GEGL_OPERATION_CROP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_CROP, GeglOperationCropClass))
+#define GEGL_IS_OPERATION_CROP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_CROP))
+#define GEGL_IS_OPERATION_CROP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_CROP))
+#define GEGL_OPERATION_CROP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_CROP, GeglOperationCropClass))
-int gegl_chant_foo = 0;
+typedef struct _GeglOperationCrop GeglOperationCrop;
+typedef struct _GeglOperationCropClass GeglOperationCropClass;
+struct _GeglOperationCrop
+{
+ GeglOperation parent_instance;
+
+ gfloat x;
+ gfloat y;
+ gfloat width;
+ gfloat height;
+};
+
+struct _GeglOperationCropClass
+{
+ GeglOperationClass parent_class;
+};
+
+GType gegl_operation_crop_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* __GEGL_OPERATION_CROP_H__ */
+
+/***************************************************************************/
+
+#include "graph/gegl-pad.h"
+#include "graph/gegl-node.h"
+#include <math.h>
+#include <string.h>
+
+
+enum
+{
+ PROP_0,
+ PROP_OUTPUT,
+ PROP_INPUT,
+ PROP_X,
+ PROP_Y,
+ PROP_WIDTH,
+ PROP_HEIGHT
+};
+
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+
+static gboolean process (GeglOperation *operation,
+ GeglNodeContext *context,
+ const gchar *output_prop,
+ const GeglRectangle *result);
+static void attach (GeglOperation *operation);
+static GeglNode * detect (GeglOperation *operation,
+ gint x,
+ gint y);
+static GeglRectangle get_defined_region (GeglOperation *operation);
+static GeglRectangle compute_input_request (GeglOperation *operation,
+ const gchar *input_pad,
+ const GeglRectangle *roi);
+static GeglRectangle compute_affected_region (GeglOperation *operation,
+ const gchar *input_pad,
+ const GeglRectangle *input_region);
+
+G_DEFINE_DYNAMIC_TYPE (GeglOperationCrop, gegl_operation_crop,
+ GEGL_TYPE_OPERATION)
+
+static void
+gegl_operation_crop_class_init (GeglOperationCropClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+
+ object_class->set_property = set_property;
+ object_class->get_property = get_property;
+
+ operation_class->categories = "core";
+ operation_class->no_cache = TRUE;
+ operation_class->process = process;
+ operation_class->attach = attach;
+ operation_class->detect = detect;
+ operation_class->get_defined_region = get_defined_region;
+ operation_class->compute_input_request = compute_input_request;
+ operation_class->compute_affected_region = compute_affected_region;
+
+ gegl_operation_class_set_name (operation_class, "crop");
+
+ g_object_class_install_property (object_class, PROP_OUTPUT,
+ g_param_spec_object ("output",
+ "Output",
+ "Ouput pad for generated image buffer.",
+ GEGL_TYPE_BUFFER,
+ G_PARAM_READABLE |
+ GEGL_PARAM_PAD_OUTPUT));
+
+ g_object_class_install_property (object_class, PROP_INPUT,
+ g_param_spec_object ("input",
+ "Input",
+ "Input pad, for image buffer input.",
+ GEGL_TYPE_BUFFER,
+ G_PARAM_READWRITE |
+ GEGL_PARAM_PAD_INPUT));
+
+ g_object_class_install_property (object_class, PROP_X,
+ g_param_spec_float ("x",
+ "X",
+ "X",
+ -G_MAXFLOAT, G_MAXFLOAT,
+ 0.0,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_Y,
+ g_param_spec_float ("y",
+ "Y",
+ "Y",
+ -G_MAXFLOAT, G_MAXFLOAT,
+ 0.0,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_WIDTH,
+ g_param_spec_float ("width",
+ "Width",
+ "Width",
+ 0.0, G_MAXFLOAT,
+ 10.0,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+ g_object_class_install_property (object_class, PROP_HEIGHT,
+ g_param_spec_float ("height",
+ "Height",
+ "Height",
+ 0.0, G_MAXFLOAT,
+ 10.0,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+
+
+}
+
+static void
+gegl_operation_crop_class_finalize (GeglOperationCropClass *klass)
+{
+}
+
+static void
+gegl_operation_crop_init (GeglOperationCrop *self)
+{
+}
+
+static void
+attach (GeglOperation *operation)
+{
+ GObjectClass *object_class = G_OBJECT_GET_CLASS (operation);
+
+ gegl_operation_create_pad (operation,
+ g_object_class_find_property (object_class,
+ "output"));
+ gegl_operation_create_pad (operation,
+ g_object_class_find_property (object_class,
+ "input"));
+}
+
+
+static GeglNode *
+detect (GeglOperation *operation,
+ gint x,
+ gint y)
+{
+ GeglOperationCrop *self = GEGL_OPERATION_CROP (operation);
+ GeglNode *input_node;
+
+ input_node = gegl_operation_get_source_node (operation, "input");
+
+ if (input_node)
+ return gegl_operation_detect (input_node->operation,
+ x - floor (self->x),
+ y - floor (self->y));
+
+ return operation->node;
+}
+
+static void
+get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GeglOperationCrop *self = GEGL_OPERATION_CROP (object);
+
+ switch (property_id)
+ {
+ case PROP_X:
+ g_value_set_float (value, self->x);
+ break;
+
+ case PROP_Y:
+ g_value_set_float (value, self->y);
+ break;
+
+ case PROP_WIDTH:
+ g_value_set_float (value, self->width);
+ break;
+
+ case PROP_HEIGHT:
+ g_value_set_float (value, self->height);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GeglOperationCrop *self = GEGL_OPERATION_CROP (object);
+
+ switch (property_id)
+ {
+ case PROP_X:
+ self->x = g_value_get_float (value);
+ break;
+
+ case PROP_Y:
+ self->y = g_value_get_float (value);
+ break;
+
+ case PROP_WIDTH:
+ self->width = g_value_get_float (value);
+ break;
+
+ case PROP_HEIGHT:
+ self->height = g_value_get_float (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
-/* FIXME: rewrtie without chanting, wihtout deriving from GeglOperationFilter, but
- * directly from GeglOperation
- */
-/* Actual image processing code
- ************************************************************************/
static gboolean
process (GeglOperation *operation,
GeglNodeContext *context,
- GeglBuffer *input,
- GeglBuffer *ignored, /* crop ignored the normal way of doing things,. */
+ const gchar *output_prop,
const GeglRectangle *result)
{
- GeglBuffer *output;
- GeglChantOperation *crop = GEGL_CHANT_OPERATION (operation);
- GeglRectangle extent = {crop->x, crop->y, crop->width, crop->height};
-
- g_assert (input);
-
- output = gegl_buffer_create_sub_buffer (input, &extent);
- gegl_node_context_set_object (context, "output", G_OBJECT (output));
- return TRUE;
+ GeglOperationCrop *crop = GEGL_OPERATION_CROP (operation);
+ GeglBuffer *input;
+ gboolean success = FALSE;
+ GeglRectangle extent = {crop->x, crop->y, crop->width, crop->height};
+
+ if (strcmp (output_prop, "output"))
+ {
+ g_warning ("requested processing of %s pad on a crop", output_prop);
+ return FALSE;
+ }
+
+ input = gegl_node_context_get_source (context, "input");
+
+ if (input != NULL)
+ {
+ GeglBuffer *output;
+
+ output = gegl_buffer_create_sub_buffer (input, &extent);
+ gegl_node_context_set_object (context, "output", G_OBJECT (output));
+ g_object_unref (input);
+ success = TRUE;
+ }
+ else
+ {
+ if (!g_object_get_data (G_OBJECT (operation->node), "graph"))
+ g_warning ("%s got %s",
+ gegl_node_get_debug_name (operation->node),
+ input==NULL?"input==NULL":"");
+ }
+
+ return success;
}
static GeglRectangle
get_defined_region (GeglOperation *operation)
{
- GeglRectangle result = {0,0,0,0};
- GeglChantOperation *op_crop;
- GeglRectangle *in_rect;
-
- op_crop = (GeglChantOperation*)(operation);
- in_rect = gegl_operation_source_get_defined_region (operation, "input");
+ GeglRectangle result = { 0, 0, 0, 0 };
+ GeglOperationCrop *self = GEGL_OPERATION_CROP (operation);
+ GeglRectangle *in_rect = gegl_operation_source_get_defined_region (operation, "input");
if (!in_rect)
return result;
- result.x = op_crop->x;
- result.y = op_crop->y;
- result.width = op_crop->width;
- result.height = op_crop->height;
+ result.x = self->x;
+ result.y = self->y;
+ result.width = self->width;
+ result.height = self->height;
return result;
}
@@ -92,21 +347,37 @@
const gchar *input_pad,
const GeglRectangle *input_region)
{
- GeglChantOperation *op_crop = (GeglChantOperation*)(operation);
- GeglRectangle crop_rect;
+ GeglOperationCrop *self = GEGL_OPERATION_CROP (operation);
+ GeglRectangle result = {self->x, self->y, self->width, self->height};
+
+ gegl_rectangle_intersect (&result, &result, input_region);
- gegl_rectangle_set (&crop_rect, op_crop->x, op_crop->y, op_crop->width, op_crop->height);
- gegl_rectangle_intersect (&crop_rect, &crop_rect, input_region);
-
- return crop_rect;
+ return result;
}
-static void
-class_init (GeglOperationClass *operation_class)
+static GeglRectangle
+compute_input_request (GeglOperation *operation,
+ const gchar *input_pad,
+ const GeglRectangle *roi)
{
- operation_class->compute_affected_region = compute_affected_region;
- operation_class->get_defined_region = get_defined_region;
- operation_class->no_cache = TRUE;
+ return *roi;
}
-#endif
+static const GeglModuleInfo modinfo =
+{
+ GEGL_MODULE_ABI_VERSION, "crop", "", ""
+};
+
+G_MODULE_EXPORT const GeglModuleInfo *
+gegl_module_query (GTypeModule *module)
+{
+ return &modinfo;
+}
+
+G_MODULE_EXPORT gboolean
+gegl_module_register (GTypeModule *module)
+{
+ gegl_operation_crop_register_type (module);
+
+ return TRUE;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
