[gegl/soc-2011-seamless-clone: 24/35] More updates to match the changes from master
- From: Barak Itkin <barakitkin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/soc-2011-seamless-clone: 24/35] More updates to match the changes from master
- Date: Fri, 20 Jul 2012 19:14:30 +0000 (UTC)
commit fb67a9a7bb520fce79c8422ac8ebe8c78ebf0ac9
Author: Barak Itkin <lightningismyname gmail com>
Date: Fri Jun 1 19:34:02 2012 +0300
More updates to match the changes from master
.../common/seamless-clone/seamless-clone-common.c | 2 +-
.../common/seamless-clone/seamless-clone-prepare.c | 3 ++-
.../common/seamless-clone/seamless-clone-render.c | 3 ++-
operations/common/seamless-clone/seamless-clone.c | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/operations/common/seamless-clone/seamless-clone-common.c b/operations/common/seamless-clone/seamless-clone-common.c
index 4b9bb83..9e94efd 100644
--- a/operations/common/seamless-clone/seamless-clone-common.c
+++ b/operations/common/seamless-clone/seamless-clone-common.c
@@ -253,7 +253,7 @@ sc_generate_cache (GeglBuffer *fg,
void
sc_cache_free (ScCache *cache)
{
- gegl_buffer_destroy(cache->uvt);
+ g_object_unref (cache->uvt);
sc_mesh_sampling_free (cache->sampling);
p2tr_triangulation_free (cache->mesh);
sc_outline_free (cache->outline);
diff --git a/operations/common/seamless-clone/seamless-clone-prepare.c b/operations/common/seamless-clone/seamless-clone-prepare.c
index 5b68ab4..9357a66 100644
--- a/operations/common/seamless-clone/seamless-clone-prepare.c
+++ b/operations/common/seamless-clone/seamless-clone-prepare.c
@@ -62,7 +62,8 @@ prepare (GeglOperation *operation)
static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
- const GeglRectangle *roi)
+ const GeglRectangle *roi,
+ gint level)
{
gpointer *dest = GEGL_CHANT_PROPERTIES (operation) -> result;
diff --git a/operations/common/seamless-clone/seamless-clone-render.c b/operations/common/seamless-clone/seamless-clone-render.c
index 1952180..e4bd279 100644
--- a/operations/common/seamless-clone/seamless-clone-render.c
+++ b/operations/common/seamless-clone/seamless-clone-render.c
@@ -80,7 +80,8 @@ process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *aux,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
ScCache *spr = o->prepare;
diff --git a/operations/common/seamless-clone/seamless-clone.c b/operations/common/seamless-clone/seamless-clone.c
index ed1461b..1a9813d 100644
--- a/operations/common/seamless-clone/seamless-clone.c
+++ b/operations/common/seamless-clone/seamless-clone.c
@@ -75,7 +75,8 @@ process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *aux,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
gboolean return_val;
ScCache *cache;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]