[gimp] app: add gimp_drawable_apply_operation_to_buffer() and use it in ony place
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add gimp_drawable_apply_operation_to_buffer() and use it in ony place
- Date: Wed, 2 May 2012 15:59:50 +0000 (UTC)
commit 3814c9f0a6755b4f3fd1adac352713c863167a63
Author: Michael Natterer <mitch gimp org>
Date: Thu Mar 15 10:13:11 2012 +0100
app: add gimp_drawable_apply_operation_to_buffer() and use it in ony place
app/core/gimpchannel.c | 6 +-
app/core/gimpdrawable-operation.c | 104 ++++++++++++++++++++++++------------
app/core/gimpdrawable-operation.h | 40 ++++++++------
app/core/gimpdrawable.c | 3 +-
4 files changed, 97 insertions(+), 56 deletions(-)
---
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 247219c..f7ca5f0 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -1415,9 +1415,9 @@ gimp_channel_real_invert (GimpChannel *channel,
"operation", "gegl:invert",
NULL);
- gimp_drawable_apply_operation_to_tiles (drawable, NULL, NULL,
- node, TRUE,
- gimp_drawable_get_tiles (drawable));
+ gimp_drawable_apply_operation_to_buffer (drawable, NULL, NULL,
+ node, TRUE,
+ gimp_drawable_get_write_buffer (drawable));
g_object_unref (node);
diff --git a/app/core/gimpdrawable-operation.c b/app/core/gimpdrawable-operation.c
index 55843b1..b4befa0 100644
--- a/app/core/gimpdrawable-operation.c
+++ b/app/core/gimpdrawable-operation.c
@@ -39,12 +39,12 @@
/* local function prototypes */
-static void gimp_drawable_apply_operation_private (GimpDrawable *drawable,
- GimpProgress *progress,
- const gchar *undo_desc,
- GeglNode *operation,
- gboolean linear,
- TileManager *dest_tiles,
+static void gimp_drawable_apply_operation_private (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear,
+ GeglBuffer *dest_buffer,
const GeglRectangle *rect);
@@ -57,7 +57,8 @@ gimp_drawable_apply_operation (GimpDrawable *drawable,
GeglNode *operation,
gboolean linear)
{
- GeglRectangle rect;
+ GeglBuffer *dest_buffer;
+ GeglRectangle rect;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
@@ -70,14 +71,20 @@ gimp_drawable_apply_operation (GimpDrawable *drawable,
&rect.width, &rect.height))
return;
+ dest_buffer =
+ gimp_tile_manager_create_buffer (gimp_drawable_get_shadow_tiles (drawable),
+ TRUE);
+
gimp_drawable_apply_operation_private (drawable,
progress,
undo_desc,
operation,
linear,
- gimp_drawable_get_shadow_tiles (drawable),
+ dest_buffer,
&rect);
+ g_object_unref (dest_buffer);
+
gimp_drawable_merge_shadow_tiles (drawable, TRUE, undo_desc);
gimp_drawable_free_shadow_tiles (drawable);
@@ -120,12 +127,12 @@ gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
}
void
-gimp_drawable_apply_operation_to_tiles (GimpDrawable *drawable,
- GimpProgress *progress,
- const gchar *undo_desc,
- GeglNode *operation,
- gboolean linear,
- TileManager *new_tiles)
+gimp_drawable_apply_operation_to_buffer (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear,
+ GeglBuffer *dest_buffer)
{
GeglRectangle rect;
@@ -134,25 +141,54 @@ gimp_drawable_apply_operation_to_tiles (GimpDrawable *drawable,
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
g_return_if_fail (progress == NULL || undo_desc != NULL);
g_return_if_fail (GEGL_IS_NODE (operation));
- g_return_if_fail (new_tiles != NULL);
+ g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
rect.x = 0;
rect.y = 0;
- rect.width = tile_manager_width (new_tiles);
- rect.height = tile_manager_height (new_tiles);
+ rect.width = gegl_buffer_get_width (dest_buffer);
+ rect.height = gegl_buffer_get_height (dest_buffer);
gimp_drawable_apply_operation_private (drawable,
progress,
undo_desc,
operation,
linear,
- new_tiles,
+ dest_buffer,
&rect);
if (progress)
gimp_progress_end (progress);
}
+void
+gimp_drawable_apply_operation_to_tiles (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear,
+ TileManager *dest_tiles)
+{
+ GeglBuffer *dest_buffer;
+
+ g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+ g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+ g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+ g_return_if_fail (progress == NULL || undo_desc != NULL);
+ g_return_if_fail (GEGL_IS_NODE (operation));
+ g_return_if_fail (dest_tiles != NULL);
+
+ dest_buffer = gimp_tile_manager_create_buffer (dest_tiles, TRUE);
+
+ gimp_drawable_apply_operation_to_buffer (drawable,
+ progress,
+ undo_desc,
+ operation,
+ linear,
+ dest_buffer);
+
+ g_object_unref (dest_buffer);
+}
+
/* private functions */
@@ -162,13 +198,13 @@ gimp_drawable_apply_operation_private (GimpDrawable *drawable,
const gchar *undo_desc,
GeglNode *operation,
gboolean linear,
- TileManager *dest_tiles,
+ GeglBuffer *dest_buffer,
const GeglRectangle *rect)
{
- GeglBuffer *inbuf, *outbuf;
+ GeglBuffer *src_buffer;
GeglNode *gegl;
- GeglNode *input;
- GeglNode *output;
+ GeglNode *src_node;
+ GeglNode *dest_node;
GeglProcessor *processor;
gdouble value;
@@ -180,24 +216,22 @@ gimp_drawable_apply_operation_private (GimpDrawable *drawable,
"dont-cache", TRUE,
NULL);
- inbuf = gimp_drawable_get_read_buffer (drawable);
- outbuf = gimp_tile_manager_create_buffer (dest_tiles, TRUE);
+ src_buffer = gimp_drawable_get_read_buffer (drawable);
- input = gegl_node_new_child (gegl,
- "operation", "gegl:buffer-source",
- "buffer", inbuf,
- NULL);
- output = gegl_node_new_child (gegl,
- "operation", "gegl:write-buffer",
- "buffer", outbuf,
- NULL);
- g_object_unref (outbuf);
+ src_node = gegl_node_new_child (gegl,
+ "operation", "gegl:buffer-source",
+ "buffer", src_buffer,
+ NULL);
+ dest_node = gegl_node_new_child (gegl,
+ "operation", "gegl:write-buffer",
+ "buffer", dest_buffer,
+ NULL);
gegl_node_add_child (gegl, operation);
- gegl_node_link_many (input, operation, output, NULL);
+ gegl_node_link_many (src_node, operation, dest_node, NULL);
- processor = gegl_node_new_processor (output, rect);
+ processor = gegl_node_new_processor (dest_node, rect);
if (progress)
gimp_progress_start (progress, undo_desc, FALSE);
diff --git a/app/core/gimpdrawable-operation.h b/app/core/gimpdrawable-operation.h
index 5341454..f999759 100644
--- a/app/core/gimpdrawable-operation.h
+++ b/app/core/gimpdrawable-operation.h
@@ -24,24 +24,30 @@
#define __GIMP_DRAWABLE_OPERATION_H__
-void gimp_drawable_apply_operation (GimpDrawable *drawable,
- GimpProgress *progress,
- const gchar *undo_desc,
- GeglNode *operation,
- gboolean linear);
-void gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
- GimpProgress *progress,
- const gchar *undo_desc,
- const gchar *operation_type,
- GObject *config,
- gboolean linear);
+void gimp_drawable_apply_operation (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear);
+void gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ const gchar *operation_type,
+ GObject *config,
+ gboolean linear);
-void gimp_drawable_apply_operation_to_tiles (GimpDrawable *drawable,
- GimpProgress *progress,
- const gchar *undo_desc,
- GeglNode *operation,
- gboolean linear,
- TileManager *new_tiles);
+void gimp_drawable_apply_operation_to_buffer (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear,
+ GeglBuffer *dest_buffer);
+void gimp_drawable_apply_operation_to_tiles (GimpDrawable *drawable,
+ GimpProgress *progress,
+ const gchar *undo_desc,
+ GeglNode *operation,
+ gboolean linear,
+ TileManager *dest_tiles);
#endif /* __GIMP_DRAWABLE_OPERATION_H__ */
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index d8d6fd0..78d4057 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -492,7 +492,8 @@ gimp_drawable_scale (GimpItem *item,
gimp_item_get_height (item)),
NULL);
- gimp_drawable_apply_operation_to_tiles (drawable, progress, C_("undo-type", "Scale"),
+ gimp_drawable_apply_operation_to_tiles (drawable, progress,
+ C_("undo-type", "Scale"),
scale, TRUE, new_tiles);
g_object_unref (scale);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
