[gimp] app: rename GimpTileHandlerProjection to GimpTileHandlerValidate
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename GimpTileHandlerProjection to GimpTileHandlerValidate
- Date: Sun, 15 Mar 2015 21:09:36 +0000 (UTC)
commit 8c6e890835f8f9c2169f1e3c03c922082cb444e1
Author: Michael Natterer <mitch gimp org>
Date: Wed Mar 11 08:14:00 2015 +0100
app: rename GimpTileHandlerProjection to GimpTileHandlerValidate
Add virtual function validate() so subclasses can construct arbitrary
buffers on-the-fly. The default implementation blits from the
projection graph like before. Add boolean property "whole-tile" which
allows for switching between always validating entire tiles, and
validating the parts of the tile that are actually dirty.
app/core/gimpprojection.c | 24 +-
app/gegl/Makefile.am | 4 +-
app/gegl/gimptilehandlerprojection.c | 356 -----------------------------
app/gegl/gimptilehandlerprojection.h | 82 -------
app/gegl/gimptilehandlervalidate.c | 418 ++++++++++++++++++++++++++++++++++
app/gegl/gimptilehandlervalidate.h | 87 +++++++
6 files changed, 519 insertions(+), 452 deletions(-)
---
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
index b6ab28b..733c4e3 100644
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@@ -30,7 +30,7 @@
#include "gegl/gimp-babl.h"
#include "gegl/gimp-gegl-utils.h"
-#include "gegl/gimptilehandlerprojection.h"
+#include "gegl/gimptilehandlervalidate.h"
#include "gimp.h"
#include "gimp-memsize.h"
@@ -89,7 +89,7 @@ struct _GimpProjectionPrivate
GimpProjectable *projectable;
GeglBuffer *buffer;
- gpointer validate_handler;
+ GimpTileHandlerValidate *validate_handler;
cairo_region_t *update_region;
GimpProjectionChunkRender chunk_render;
@@ -391,13 +391,13 @@ gimp_projection_get_buffer (GimpPickable *pickable)
proj->priv->buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
format);
- proj->priv->validate_handler = gimp_tile_handler_projection_new (graph,
- width,
- height);
- gimp_tile_handler_projection_assign (proj->priv->validate_handler,
- proj->priv->buffer);
+ proj->priv->validate_handler =
+ GIMP_TILE_HANDLER_VALIDATE (gimp_tile_handler_validate_new (graph));
- /* This used to call gimp_tile_handler_projection_invalidate()
+ gimp_tile_handler_validate_assign (proj->priv->validate_handler,
+ proj->priv->buffer);
+
+ /* This used to call gimp_tile_handler_validate_invalidate()
* which forced the entire projection to be constructed in one
* go for new images, causing a potentially huge delay. Now we
* initially validate stuff the normal way, which makes the
@@ -923,15 +923,15 @@ gimp_projection_paint_area (GimpProjection *proj,
&x, &y, &w, &h))
{
if (proj->priv->validate_handler)
- gimp_tile_handler_projection_invalidate (proj->priv->validate_handler,
- x, y, w, h);
+ gimp_tile_handler_validate_invalidate (proj->priv->validate_handler,
+ x, y, w, h);
if (now)
{
GeglNode *graph = gimp_projectable_get_graph (proj->priv->projectable);
if (proj->priv->validate_handler)
- gimp_tile_handler_projection_undo_invalidate (proj->priv->validate_handler,
- x, y, w, h);
+ gimp_tile_handler_validate_undo_invalidate (proj->priv->validate_handler,
+ x, y, w, h);
gegl_node_blit_buffer (graph, proj->priv->buffer,
GEGL_RECTANGLE (x, y, w, h));
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index 9bf052a..5217fdf 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -40,8 +40,8 @@ libappgegl_a_sources = \
gimp-gegl-utils.h \
gimpapplicator.c \
gimpapplicator.h \
- gimptilehandlerprojection.c \
- gimptilehandlerprojection.h
+ gimptilehandlervalidate.c \
+ gimptilehandlervalidate.h
libappgegl_a_built_sources = gimp-gegl-enums.c
diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c
new file mode 100644
index 0000000..7eacffd
--- /dev/null
+++ b/app/gegl/gimptilehandlervalidate.c
@@ -0,0 +1,418 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gimptilehandlervalidate.h"
+
+
+enum
+{
+ PROP_0,
+ PROP_FORMAT,
+ PROP_TILE_WIDTH,
+ PROP_TILE_HEIGHT,
+ PROP_WHOLE_TILE
+};
+
+
+static void gimp_tile_handler_validate_finalize (GObject *object);
+static void gimp_tile_handler_validate_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_tile_handler_validate_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static void gimp_tile_handler_validate_real_validate (GimpTileHandlerValidate *validate,
+ const GeglRectangle *rect,
+ const Babl *format,
+ gpointer dest_buf,
+ gint dest_stride);
+
+static gpointer gimp_tile_handler_validate_command (GeglTileSource *source,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data);
+
+
+G_DEFINE_TYPE (GimpTileHandlerValidate, gimp_tile_handler_validate,
+ GEGL_TYPE_TILE_HANDLER)
+
+#define parent_class gimp_tile_handler_validate_parent_class
+
+
+static void
+gimp_tile_handler_validate_class_init (GimpTileHandlerValidateClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = gimp_tile_handler_validate_finalize;
+ object_class->set_property = gimp_tile_handler_validate_set_property;
+ object_class->get_property = gimp_tile_handler_validate_get_property;
+
+ klass->validate = gimp_tile_handler_validate_real_validate;
+
+ g_object_class_install_property (object_class, PROP_FORMAT,
+ g_param_spec_pointer ("format", NULL, NULL,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_TILE_WIDTH,
+ g_param_spec_int ("tile-width", NULL, NULL,
+ 1, G_MAXINT, 1,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_TILE_HEIGHT,
+ g_param_spec_int ("tile-height", NULL, NULL,
+ 1, G_MAXINT, 1,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_WHOLE_TILE,
+ g_param_spec_boolean ("whole-tile", NULL, NULL,
+ FALSE,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tile_handler_validate_init (GimpTileHandlerValidate *validate)
+{
+ GeglTileSource *source = GEGL_TILE_SOURCE (validate);
+
+ source->command = gimp_tile_handler_validate_command;
+
+ validate->dirty_region = cairo_region_create ();
+}
+
+static void
+gimp_tile_handler_validate_finalize (GObject *object)
+{
+ GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+ if (validate->graph)
+ {
+ g_object_unref (validate->graph);
+ validate->graph = NULL;
+ }
+
+ cairo_region_destroy (validate->dirty_region);
+ validate->dirty_region = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tile_handler_validate_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+ switch (property_id)
+ {
+ case PROP_FORMAT:
+ validate->format = g_value_get_pointer (value);
+ break;
+ case PROP_TILE_WIDTH:
+ validate->tile_width = g_value_get_int (value);
+ break;
+ case PROP_TILE_HEIGHT:
+ validate->tile_height = g_value_get_int (value);
+ break;
+ case PROP_WHOLE_TILE:
+ validate->whole_tile = g_value_get_boolean (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_tile_handler_validate_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+ switch (property_id)
+ {
+ case PROP_FORMAT:
+ g_value_set_pointer (value, (gpointer) validate->format);
+ break;
+ case PROP_TILE_WIDTH:
+ g_value_set_int (value, validate->tile_width);
+ break;
+ case PROP_TILE_HEIGHT:
+ g_value_set_int (value, validate->tile_height);
+ break;
+ case PROP_WHOLE_TILE:
+ g_value_set_boolean (value, validate->whole_tile);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_tile_handler_validate_real_validate (GimpTileHandlerValidate *validate,
+ const GeglRectangle *rect,
+ const Babl *format,
+ gpointer dest_buf,
+ gint dest_stride)
+{
+#if 0
+ g_printerr ("validating at %d %d %d %d\n",
+ rect.x,
+ rect.y,
+ rect.width,
+ rect.height);
+#endif
+
+ gegl_node_blit (validate->graph, 1.0, rect, format,
+ dest_buf, dest_stride,
+ GEGL_BLIT_DEFAULT);
+}
+
+static GeglTile *
+gimp_tile_handler_validate_validate (GeglTileSource *source,
+ GeglTile *tile,
+ gint x,
+ gint y)
+{
+ GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (source);
+ cairo_rectangle_int_t tile_rect;
+
+ if (cairo_region_is_empty (validate->dirty_region))
+ return tile;
+
+ tile_rect.x = x * validate->tile_width;
+ tile_rect.y = y * validate->tile_height;
+ tile_rect.width = validate->tile_width;
+ tile_rect.height = validate->tile_height;
+
+ if (validate->whole_tile)
+ {
+ if (cairo_region_contains_rectangle (validate->dirty_region, &tile_rect)
+ != CAIRO_REGION_OVERLAP_OUT)
+ {
+ gint tile_bpp;
+ gint tile_stride;
+
+ if (! tile)
+ tile = gegl_tile_handler_create_tile (GEGL_TILE_HANDLER (source),
+ x, y, 0);
+
+ cairo_region_subtract_rectangle (validate->dirty_region, &tile_rect);
+
+ tile_bpp = babl_format_get_bytes_per_pixel (validate->format);
+ tile_stride = tile_bpp * validate->tile_width;
+
+ gegl_tile_lock (tile);
+
+ GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->validate
+ (validate,
+ GEGL_RECTANGLE (tile_rect.x,
+ tile_rect.y,
+ tile_rect.width,
+ tile_rect.height),
+ validate->format,
+ gegl_tile_get_data (tile),
+ tile_stride);
+
+ gegl_tile_unlock (tile);
+ }
+ }
+ else
+ {
+ cairo_region_t *tile_region = cairo_region_copy (validate->dirty_region);
+
+ cairo_region_intersect_rectangle (tile_region, &tile_rect);
+
+ if (! cairo_region_is_empty (tile_region))
+ {
+ gint tile_bpp;
+ gint tile_stride;
+ gint n_rects;
+ gint i;
+
+ if (! tile)
+ tile = gegl_tile_handler_create_tile (GEGL_TILE_HANDLER (source),
+ x, y, 0);
+
+ cairo_region_subtract_rectangle (validate->dirty_region, &tile_rect);
+
+ tile_bpp = babl_format_get_bytes_per_pixel (validate->format);
+ tile_stride = tile_bpp * validate->tile_width;
+
+ gegl_tile_lock (tile);
+
+ n_rects = cairo_region_num_rectangles (tile_region);
+
+#if 0
+ g_printerr ("%d chunks\n", n_rects);
+#endif
+
+ for (i = 0; i < n_rects; i++)
+ {
+ cairo_rectangle_int_t blit_rect;
+
+ cairo_region_get_rectangle (tile_region, i, &blit_rect);
+
+ GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->validate
+ (validate,
+ GEGL_RECTANGLE (blit_rect.x,
+ blit_rect.y,
+ blit_rect.width,
+ blit_rect.height),
+ validate->format,
+ gegl_tile_get_data (tile) +
+ (blit_rect.y % validate->tile_height) * tile_stride +
+ (blit_rect.x % validate->tile_width) * tile_bpp,
+ tile_stride);
+ }
+
+ gegl_tile_unlock (tile);
+ }
+
+ cairo_region_destroy (tile_region);
+ }
+
+ return tile;
+}
+
+static gpointer
+gimp_tile_handler_validate_command (GeglTileSource *source,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
+{
+ GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (source);
+ gpointer retval;
+
+ validate->max_z = MAX (validate->max_z, z);
+
+ retval = gegl_tile_handler_source_command (source, command, x, y, z, data);
+
+ if (command == GEGL_TILE_GET && z == 0)
+ retval = gimp_tile_handler_validate_validate (source, retval, x, y);
+
+ return retval;
+}
+
+
+/* public functions */
+
+GeglTileHandler *
+gimp_tile_handler_validate_new (GeglNode *graph)
+{
+ GimpTileHandlerValidate *validate;
+
+ g_return_val_if_fail (GEGL_IS_NODE (graph), NULL);
+
+ validate = g_object_new (GIMP_TYPE_TILE_HANDLER_VALIDATE, NULL);
+
+ validate->graph = g_object_ref (graph);
+
+ return GEGL_TILE_HANDLER (validate);
+}
+
+void
+gimp_tile_handler_validate_assign (GimpTileHandlerValidate *validate,
+ GeglBuffer *buffer)
+{
+ g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+ g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+ gegl_buffer_add_handler (buffer, validate);
+
+ g_object_get (buffer,
+ "format", &validate->format,
+ "tile-width", &validate->tile_width,
+ "tile-height", &validate->tile_height,
+ NULL);
+}
+
+void
+gimp_tile_handler_validate_invalidate (GimpTileHandlerValidate *validate,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
+{
+ cairo_rectangle_int_t rect = { x, y, width, height };
+
+ g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+
+ cairo_region_union_rectangle (validate->dirty_region, &rect);
+
+ if (validate->max_z > 0)
+ {
+ GeglTileSource *source = GEGL_TILE_SOURCE (validate);
+ gint tile_x1 = x / validate->tile_width;
+ gint tile_y1 = y / validate->tile_height;
+ gint tile_x2 = (x + width - 1) / validate->tile_width + 1;
+ gint tile_y2 = (y + height - 1) / validate->tile_height + 1;
+ gint tile_x;
+ gint tile_y;
+ gint tile_z;
+
+ for (tile_z = 1; tile_z <= validate->max_z; tile_z++)
+ {
+ tile_y1 = tile_y1 / 2;
+ tile_y2 = (tile_y2 + 1) / 2;
+ tile_x1 = tile_x1 / 2;
+ tile_x2 = (tile_x2 + 1) / 2;
+
+ for (tile_y = tile_y1; tile_y < tile_y2; tile_y++)
+ for (tile_x = tile_x1; tile_x < tile_x2; tile_x++)
+ gegl_tile_source_void (source, tile_x, tile_y, tile_z);
+ }
+ }
+}
+
+void
+gimp_tile_handler_validate_undo_invalidate (GimpTileHandlerValidate *validate,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
+{
+ cairo_rectangle_int_t rect = { x, y, width, height };
+
+ g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+
+ cairo_region_subtract_rectangle (validate->dirty_region, &rect);
+}
diff --git a/app/gegl/gimptilehandlervalidate.h b/app/gegl/gimptilehandlervalidate.h
new file mode 100644
index 0000000..9dfc553
--- /dev/null
+++ b/app/gegl/gimptilehandlervalidate.h
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TILE_HANDLER_VALIDATE_H__
+#define __GIMP_TILE_HANDLER_VALIDATE_H__
+
+#include <gegl-buffer-backend.h>
+
+/***
+ * GimpTileHandlerValidate is a GeglTileHandler that renders the
+ * projection.
+ */
+
+G_BEGIN_DECLS
+
+#define GIMP_TYPE_TILE_HANDLER_VALIDATE (gimp_tile_handler_validate_get_type ())
+#define GIMP_TILE_HANDLER_VALIDATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidate))
+#define GIMP_TILE_HANDLER_VALIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidateClass))
+#define GIMP_IS_TILE_HANDLER_VALIDATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_TILE_HANDLER_VALIDATE))
+#define GIMP_IS_TILE_HANDLER_VALIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GIMP_TYPE_TILE_HANDLER_VALIDATE))
+#define GIMP_TILE_HANDLER_VALIDATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidateClass))
+
+
+typedef struct _GimpTileHandlerValidate GimpTileHandlerValidate;
+typedef struct _GimpTileHandlerValidateClass GimpTileHandlerValidateClass;
+
+struct _GimpTileHandlerValidate
+{
+ GeglTileHandler parent_instance;
+
+ GeglNode *graph;
+ cairo_region_t *dirty_region;
+ const Babl *format;
+ gint tile_width;
+ gint tile_height;
+ gint max_z;
+ gboolean whole_tile;
+};
+
+struct _GimpTileHandlerValidateClass
+{
+ GeglTileHandlerClass parent_class;
+
+ void (* validate) (GimpTileHandlerValidate *validate,
+ const GeglRectangle *rect,
+ const Babl *format,
+ gpointer dest_buf,
+ gint dest_stride);
+};
+
+
+GType gimp_tile_handler_validate_get_type (void) G_GNUC_CONST;
+
+GeglTileHandler * gimp_tile_handler_validate_new (GeglNode *graph);
+
+void gimp_tile_handler_validate_assign (GimpTileHandlerValidate *validate,
+ GeglBuffer *buffer);
+
+void gimp_tile_handler_validate_invalidate (GimpTileHandlerValidate *validate,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+void gimp_tile_handler_validate_undo_invalidate (GimpTileHandlerValidate *validate,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_TILE_HANDLER_VALIDATE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
