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

app: port GimpDrawableModUndo to storing pixels as GeglBuffers

Browse Source
This commit is contained in:
Michael Natterer
2012-03-21 21:36:50 +01:00
parent 9774bb62e7
commit 715bd7cfbb
4 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/core/gimpdrawablemodundo.c
View File

@ -21,7 +21,7 @@
#include "core-types.h" #include "core-types.h"
#include "base/tile-manager.h" #include "gegl/gimp-gegl-utils.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpdrawable.h" #include "gimpdrawable.h"
@ -31,7 +31,7 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_COPY_TILES PROP_COPY_BUFFER
}; };
@ -76,8 +76,9 @@ gimp_drawable_mod_undo_class_init (GimpDrawableModUndoClass *klass)
undo_class->pop = gimp_drawable_mod_undo_pop; undo_class->pop = gimp_drawable_mod_undo_pop;
undo_class->free = gimp_drawable_mod_undo_free; undo_class->free = gimp_drawable_mod_undo_free;
g_object_class_install_property (object_class, PROP_COPY_TILES, g_object_class_install_property (object_class, PROP_COPY_BUFFER,
g_param_spec_boolean ("copy-tiles", NULL, NULL, g_param_spec_boolean ("copy-buffer",
NULL, NULL,
FALSE, FALSE,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
@ -103,15 +104,15 @@ gimp_drawable_mod_undo_constructed (GObject *object)
item = GIMP_ITEM_UNDO (object)->item; item = GIMP_ITEM_UNDO (object)->item;
drawable = GIMP_DRAWABLE (item); drawable = GIMP_DRAWABLE (item);
if (drawable_mod_undo->copy_tiles) if (drawable_mod_undo->copy_buffer)
{ {
drawable_mod_undo->tiles = drawable_mod_undo->buffer =
tile_manager_duplicate (gimp_drawable_get_tiles (drawable)); gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
} }
else else
{ {
drawable_mod_undo->tiles = drawable_mod_undo->buffer =
tile_manager_ref (gimp_drawable_get_tiles (drawable)); g_object_ref (gimp_drawable_get_buffer (drawable));
} }
drawable_mod_undo->type = gimp_drawable_type (drawable); drawable_mod_undo->type = gimp_drawable_type (drawable);
@ -131,8 +132,8 @@ gimp_drawable_mod_undo_set_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_COPY_TILES: case PROP_COPY_BUFFER:
drawable_mod_undo->copy_tiles = g_value_get_boolean (value); drawable_mod_undo->copy_buffer = g_value_get_boolean (value);
break; break;
default: default:
@ -151,8 +152,8 @@ gimp_drawable_mod_undo_get_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_COPY_TILES: case PROP_COPY_BUFFER:
g_value_set_boolean (value, drawable_mod_undo->copy_tiles); g_value_set_boolean (value, drawable_mod_undo->copy_buffer);
break; break;
default: default:
@ -168,7 +169,7 @@ gimp_drawable_mod_undo_get_memsize (GimpObject *object,
GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object); GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
gint64 memsize = 0; gint64 memsize = 0;
memsize += tile_manager_get_memsize (drawable_mod_undo->tiles, FALSE); /* FIXME memsize += gimp_gegl_buffer_get_memsize (drawable_mod_undo->buffer, FALSE); */
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object, return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
gui_size); gui_size);
@ -181,28 +182,28 @@ gimp_drawable_mod_undo_pop (GimpUndo *undo,
{ {
GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo); GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo);
GimpDrawable *drawable = GIMP_DRAWABLE (GIMP_ITEM_UNDO (undo)->item); GimpDrawable *drawable = GIMP_DRAWABLE (GIMP_ITEM_UNDO (undo)->item);
TileManager *tiles; GeglBuffer *buffer;
GimpImageType type; GimpImageType type;
gint offset_x; gint offset_x;
gint offset_y; gint offset_y;
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum); GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
tiles = drawable_mod_undo->tiles; buffer = drawable_mod_undo->buffer;
type = drawable_mod_undo->type; type = drawable_mod_undo->type;
offset_x = drawable_mod_undo->offset_x; offset_x = drawable_mod_undo->offset_x;
offset_y = drawable_mod_undo->offset_y; offset_y = drawable_mod_undo->offset_y;
drawable_mod_undo->tiles = tile_manager_ref (gimp_drawable_get_tiles (drawable)); drawable_mod_undo->buffer = g_object_ref (gimp_drawable_get_buffer (drawable));
drawable_mod_undo->type = gimp_drawable_type (drawable); drawable_mod_undo->type = gimp_drawable_type (drawable);
gimp_item_get_offset (GIMP_ITEM (drawable), gimp_item_get_offset (GIMP_ITEM (drawable),
&drawable_mod_undo->offset_x, &drawable_mod_undo->offset_x,
&drawable_mod_undo->offset_y); &drawable_mod_undo->offset_y);
gimp_drawable_set_tiles_full (drawable, FALSE, NULL, gimp_drawable_set_buffer_full (drawable, FALSE, NULL,
tiles, type, offset_x, offset_y); buffer, type, offset_x, offset_y);
tile_manager_unref (tiles); g_object_unref (buffer);
} }
static void static void
@ -211,10 +212,10 @@ gimp_drawable_mod_undo_free (GimpUndo *undo,
{ {
GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo); GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo);
if (drawable_mod_undo->tiles) if (drawable_mod_undo->buffer)
{ {
tile_manager_unref (drawable_mod_undo->tiles); g_object_unref (drawable_mod_undo->buffer);
drawable_mod_undo->tiles = NULL; drawable_mod_undo->buffer = NULL;
} }
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode); GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);

4
app/core/gimpdrawablemodundo.h
View File

@ -36,8 +36,8 @@ struct _GimpDrawableModUndo
{ {
GimpItemUndo parent_instance; GimpItemUndo parent_instance;
TileManager *tiles; GeglBuffer *buffer;
gboolean copy_tiles; gboolean copy_buffer;
GimpImageType type; GimpImageType type;
gint offset_x; gint offset_x;
gint offset_y; gint offset_y;

6
app/core/gimpimage-undo-push.c
View File

@ -255,7 +255,7 @@ GimpUndo *
gimp_image_undo_push_drawable_mod (GimpImage *image, gimp_image_undo_push_drawable_mod (GimpImage *image,
const gchar *undo_desc, const gchar *undo_desc,
GimpDrawable *drawable, GimpDrawable *drawable,
gboolean copy_tiles) gboolean copy_buffer)
{ {
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
@ -264,8 +264,8 @@ gimp_image_undo_push_drawable_mod (GimpImage *image,
return gimp_image_undo_push (image, GIMP_TYPE_DRAWABLE_MOD_UNDO, return gimp_image_undo_push (image, GIMP_TYPE_DRAWABLE_MOD_UNDO,
GIMP_UNDO_DRAWABLE_MOD, undo_desc, GIMP_UNDO_DRAWABLE_MOD, undo_desc,
GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE, GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
"item", drawable, "item", drawable,
"copy-tiles", copy_tiles, "copy-buffer", copy_buffer,
NULL); NULL);
} }

2
app/core/gimpimage-undo-push.h
View File

@ -68,7 +68,7 @@ GimpUndo * gimp_image_undo_push_drawable (GimpImage *image,
GimpUndo * gimp_image_undo_push_drawable_mod (GimpImage *image, GimpUndo * gimp_image_undo_push_drawable_mod (GimpImage *image,
const gchar *undo_desc, const gchar *undo_desc,
GimpDrawable *drawable, GimpDrawable *drawable,
gboolean copy_tiles); gboolean copy_buffer);
/* mask undo */ /* mask undo */