callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated from GEGL.

Browse Source 
2008-01-07  Michael Natterer  <mitch@gimp.org>

	* app/gegl/gegl/gegl-operation.h: updated from GEGL.

	* app/gegl/gimpoperationtilesource.c: use the passed buffer in
	process() and add prepare() implementation which sets the format.


svn path=/trunk/; revision=24559
This commit is contained in:
Michael Natterer
2008-01-07 15:33:02 +00:00
committed by Michael Natterer
parent 3fd57a5fe2
commit d916692cad
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-01-07 Michael Natterer <mitch@gimp.org>
* app/gegl/gegl/gegl-operation.h: updated from GEGL.
* app/gegl/gimpoperationtilesource.c: use the passed buffer in
process() and add prepare() implementation which sets the format.
2008-01-05 Joao S. O. Bueno <gwidion@mpc.com.br>
* plug-ins/pygimp/pygimp-vectors.c: fixed incorrect function name

4
app/gegl/gegl/gegl-operation.h
View File

@ -188,7 +188,9 @@ void gegl_operation_create_pad (GeglOperation *operation,
* turn into a global mechanism) */
void gegl_operation_set_format (GeglOperation *operation,
const gchar *pad_name,
Babl *format);
const Babl *format);
const Babl * gegl_operation_get_format (GeglOperation *operation,
const gchar *pad_name);
/* Used to look up the gtype when changing the type of operation associated
* a GeglNode using just a string with the registered name.

35
app/gegl/gimpoperationtilesource.c
View File

@ -56,9 +56,9 @@ static void gimp_operation_tile_source_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
static void gimp_operation_tile_source_prepare (GeglOperation *operation);
static GeglRectangle
gimp_operation_tile_source_get_defined_region (GeglOperation *operation);
static gboolean gimp_operation_tile_source_process (GeglOperation *operation,
GeglNodeContext *context,
GeglBuffer *output,
@ -82,6 +82,7 @@ gimp_operation_tile_source_class_init (GimpOperationTileSourceClass * klass)
object_class->set_property = gimp_operation_tile_source_set_property;
object_class->get_property = gimp_operation_tile_source_get_property;
operation_class->prepare = gimp_operation_tile_source_prepare;
operation_class->get_defined_region = gimp_operation_tile_source_get_defined_region;
operation_class->adjust_result_region = NULL; /* the default source is
expanding to agressivly
@ -180,6 +181,25 @@ gimp_operation_tile_source_set_property (GObject *object,
}
}
static void
gimp_operation_tile_source_prepare (GeglOperation *operation)
{
GimpOperationTileSource *self = GIMP_OPERATION_TILE_SOURCE (operation);
if (self->tile_manager)
{
const Babl *format;
guint bpp = tile_manager_bpp (self->tile_manager);
if (self->linear)
format = gimp_bpp_to_babl_format_linear (bpp);
else
format = gimp_bpp_to_babl_format (bpp);
gegl_operation_set_format (operation, "output", format);
}
}
static GeglRectangle
gimp_operation_tile_source_get_defined_region (GeglOperation *operation)
{
@ -207,18 +227,11 @@ gimp_operation_tile_source_process (GeglOperation *operation,
if (self->tile_manager)
{
GeglBuffer *output;
const Babl *format;
PixelRegion srcPR;
guint bpp = tile_manager_bpp (self->tile_manager);
gpointer pr;
if (self->linear) /* FIXME: this should be set in prepare and not process */
format = gimp_bpp_to_babl_format_linear (bpp);
else
format = gimp_bpp_to_babl_format (bpp);
output = gegl_buffer_new (result, format); /* FIXME: use the passed in buffer */
format = gegl_operation_get_format (operation, "output");
pixel_region_init (&srcPR, self->tile_manager,
result->x, result->y,
@ -233,10 +246,6 @@ gimp_operation_tile_source_process (GeglOperation *operation,
gegl_buffer_set (output, &rect, format, srcPR.data, srcPR.rowstride);
}
gegl_node_context_set_object (context, "output", G_OBJECT (output)); /* FIXME: should not be needed
if using the passed in
buffer */
}
return TRUE;