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

app: move core/gimp-apply-operation.[ch] to gegl/gimp-gegl-apply-operation.[ch]

Browse Source
This commit is contained in:
Michael Natterer
2012-10-22 16:03:40 +02:00
parent 9b58e2ba0c
commit eb89a545d5
16 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/Makefile.am
View File

@ -21,8 +21,6 @@ libappcore_a_sources = \
core-types.h \
gimp.c \
gimp.h \
gimp-apply-operation.c \
gimp-apply-operation.h \
gimp-cairo.c \
gimp-cairo.h \
gimp-contexts.c \

32
app/core/gimpchannel.c
View File

@ -32,10 +32,10 @@
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimp-utils.h"
#include "gimpboundary.h"
#include "gimpcontainer.h"
@ -1504,11 +1504,11 @@ gimp_channel_real_border (GimpChannel *channel,
"edge-lock", edge_lock,
NULL);
gimp_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
border,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
gimp_gegl_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
border,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (border);
@ -1578,11 +1578,11 @@ gimp_channel_real_grow (GimpChannel *channel,
"radius-y", radius_y,
NULL);
gimp_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
grow,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
gimp_gegl_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
grow,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (grow);
@ -1643,11 +1643,11 @@ gimp_channel_real_shrink (GimpChannel *channel,
"edge-lock", edge_lock,
NULL);
gimp_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
shrink,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
gimp_gegl_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
NULL, NULL,
shrink,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (shrink);

8
app/core/gimpdrawable-blend.c
View File

@ -30,11 +30,11 @@
#include "core-types.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-utils.h"
#include "gimp-apply-operation.h"
#include "gimpchannel.h"
#include "gimpcontext.h"
#include "gimpdrawable-blend.h"
@ -609,9 +609,9 @@ gradient_precalc_shapeburst (GimpImage *image,
gimp_gegl_progress_connect (shapeburst, progress, NULL);
gimp_apply_operation (temp_buffer, NULL, NULL,
shapeburst,
dist_buffer, NULL);
gimp_gegl_apply_operation (temp_buffer, NULL, NULL,
shapeburst,
dist_buffer, NULL);
gegl_node_get (shapeburst, "max-iterations", &max, NULL);

8
app/core/gimpdrawable-bucket-fill.c
View File

@ -27,11 +27,11 @@
#include "core-types.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimpchannel.h"
#include "gimpchannel-combine.h"
#include "gimpcontext.h"
@ -251,9 +251,9 @@ gimp_drawable_bucket_fill_internal (GimpDrawable *drawable,
-mask_offset_y,
1.0);
gimp_apply_operation (buffer, NULL, NULL,
apply_opacity,
buffer, NULL);
gimp_gegl_apply_operation (buffer, NULL, NULL,
apply_opacity,
buffer, NULL);
g_object_unref (apply_opacity);
g_object_unref (mask);

10
app/core/gimpdrawable-combine.c
View File

@ -24,12 +24,12 @@
#include "core-types.h"
#include "gegl/gimp-babl-compat.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-loops.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimpchannel.h"
#include "gimpdrawable-combine.h"
#include "gimpdrawableundo.h"
@ -138,10 +138,10 @@ gimp_drawable_real_apply_buffer (GimpDrawable *drawable,
mode,
affect);
gimp_apply_operation (base_buffer, NULL, NULL,
apply,
gimp_drawable_get_buffer (drawable),
GEGL_RECTANGLE (x, y, width, height));
gimp_gegl_apply_operation (base_buffer, NULL, NULL,
apply,
gimp_drawable_get_buffer (drawable),
GEGL_RECTANGLE (x, y, width, height));
g_object_unref (apply);
}

19
app/core/gimpdrawable-operation.c
View File

@ -26,7 +26,8 @@
#include "core-types.h"
#include "gimp-apply-operation.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gimpdrawable.h"
#include "gimpdrawable-operation.h"
#include "gimpdrawable-shadow.h"
@ -58,10 +59,10 @@ gimp_drawable_apply_operation (GimpDrawable *drawable,
dest_buffer = gimp_drawable_get_shadow_buffer (drawable);
gimp_apply_operation (gimp_drawable_get_buffer (drawable),
progress, undo_desc,
operation,
dest_buffer, &rect);
gimp_gegl_apply_operation (gimp_drawable_get_buffer (drawable),
progress, undo_desc,
operation,
dest_buffer, &rect);
gimp_drawable_merge_shadow_buffer (drawable, TRUE, undo_desc);
gimp_drawable_free_shadow_buffer (drawable);
@ -115,8 +116,8 @@ gimp_drawable_apply_operation_to_buffer (GimpDrawable *drawable,
g_return_if_fail (GEGL_IS_NODE (operation));
g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
gimp_apply_operation (gimp_drawable_get_buffer (drawable),
progress, undo_desc,
operation,
dest_buffer, NULL);
gimp_gegl_apply_operation (gimp_drawable_get_buffer (drawable),
progress, undo_desc,
operation,
dest_buffer, NULL);
}

8
app/core/gimpdrawable-stroke.c
View File

@ -30,11 +30,11 @@
#include "core-types.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimpbezierdesc.h"
#include "gimpboundary.h"
#include "gimpchannel.h"
@ -381,9 +381,9 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
apply_opacity = gimp_gegl_create_apply_opacity_node (mask_buffer, 0, 0, 1.0);
gimp_apply_operation (base_buffer, NULL, NULL,
apply_opacity,
base_buffer, NULL);
gimp_gegl_apply_operation (base_buffer, NULL, NULL,
apply_opacity,
base_buffer, NULL);
g_object_unref (apply_opacity);

8
app/core/gimpdrawable-transform.c
View File

@ -30,11 +30,11 @@
#include "core-types.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimp-transform-resize.h"
#include "gimpchannel.h"
#include "gimpcontext.h"
@ -144,9 +144,9 @@ gimp_drawable_transform_buffer_affine (GimpDrawable *drawable,
gimp_gegl_node_set_matrix (affine, &gegl_matrix);
gimp_apply_operation (orig_buffer, progress, NULL,
affine,
new_buffer, NULL);
gimp_gegl_apply_operation (orig_buffer, progress, NULL,
affine,
new_buffer, NULL);
g_object_unref (affine);

9
app/core/gimpimage-merge.c
View File

@ -28,13 +28,13 @@
#include "core-types.h"
#include "gegl/gimp-babl-compat.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "vectors/gimpvectors.h"
#include "gimp.h"
#include "gimp-apply-operation.h"
#include "gimpcontext.h"
#include "gimperror.h"
#include "gimpgrouplayer.h"
@ -50,6 +50,7 @@
#include "gimp-intl.h"
static GimpLayer * gimp_image_merge_layers (GimpImage *image,
GimpContainer *container,
GSList *merge_list,
@ -621,9 +622,9 @@ gimp_image_merge_layers (GimpImage *image,
mode,
GIMP_COMPONENT_ALL);
gimp_apply_operation (merge_buffer, NULL, NULL,
apply,
merge_buffer, NULL);
gimp_gegl_apply_operation (merge_buffer, NULL, NULL,
apply,
merge_buffer, NULL);
g_object_unref (apply);

18
app/core/gimplayer.c
View File

@ -30,10 +30,10 @@
#include "core-types.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp-apply-operation.h"
#include "gimpboundary.h"
#include "gimpchannel-select.h"
#include "gimpcontext.h"
@ -1429,11 +1429,11 @@ gimp_layer_create_mask (const GimpLayer *layer,
"value", 1.0,
NULL);
gimp_apply_operation (gimp_drawable_get_buffer (drawable),
NULL, NULL,
set_alpha,
gimp_drawable_get_buffer (drawable),
NULL);
gimp_gegl_apply_operation (gimp_drawable_get_buffer (drawable),
NULL, NULL,
set_alpha,
gimp_drawable_get_buffer (drawable),
NULL);
g_object_unref (set_alpha);
}
@ -1526,9 +1526,9 @@ gimp_layer_create_mask (const GimpLayer *layer,
gimp_rgba_set (&background, 0.0, 0.0, 0.0, 0.0);
flatten = gimp_gegl_create_flatten_node (&background);
gimp_apply_operation (src_buffer, NULL, NULL,
flatten,
dest_buffer, NULL);
gimp_gegl_apply_operation (src_buffer, NULL, NULL,
flatten,
dest_buffer, NULL);
g_object_unref (flatten);
}

8
app/core/gimpselection.c
View File

@ -24,12 +24,12 @@
#include "core-types.h"
#include "gegl/gimp-babl.h"
#include "gegl/gimp-gegl-apply-operation.h"
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimp-edit.h"
#include "gimp-apply-operation.h"
#include "gimpcontext.h"
#include "gimpdrawable-private.h"
#include "gimperror.h"
@ -757,9 +757,9 @@ gimp_selection_extract (GimpSelection *selection,
- (off_y + y1),
1.0);
gimp_apply_operation (dest_buffer, NULL, NULL,
apply_opacity,
dest_buffer, NULL);
gimp_gegl_apply_operation (dest_buffer, NULL, NULL,
apply_opacity,
dest_buffer, NULL);
g_object_unref (apply_opacity);

2
app/gegl/Makefile.am
View File

@ -24,6 +24,8 @@ libappgegl_a_sources = \
gimp-babl-compat.h \
gimp-gegl.c \
gimp-gegl.h \
gimp-gegl-apply-operation.c \
gimp-gegl-apply-operation.h \
gimp-gegl-config-proxy.c \
gimp-gegl-config-proxy.h \
gimp-gegl-loops.c \

21
app/core/gimp-apply-operation.c → app/gegl/gimp-gegl-apply-operation.c
View File

@ -24,20 +24,21 @@
#include <gegl.h>
#include "core-types.h"
#include "gimp-gegl-types.h"
#include "gimp-utils.h"
#include "gimp-apply-operation.h"
#include "gimpprogress.h"
#include "core/gimp-utils.h"
#include "core/gimpprogress.h"
#include "gimp-gegl-apply-operation.h"
void
gimp_apply_operation (GeglBuffer *src_buffer,
GimpProgress *progress,
const gchar *undo_desc,
GeglNode *operation,
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect)
gimp_gegl_apply_operation (GeglBuffer *src_buffer,
GimpProgress *progress,
const gchar *undo_desc,
GeglNode *operation,
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect)
{
GeglNode *gegl;
GeglNode *src_node;

18
app/core/gimp-apply-operation.h → app/gegl/gimp-gegl-apply-operation.h
View File

@ -20,16 +20,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_APPLY_OPERATION_H__
#define __GIMP_APPLY_OPERATION_H__
#ifndef __GIMP_GEGL_APPLY_OPERATION_H__
#define __GIMP_GEGL_APPLY_OPERATION_H__
void gimp_apply_operation (GeglBuffer *src_buffer,
GimpProgress *progress,
const gchar *undo_desc,
GeglNode *operation,
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect);
void gimp_gegl_apply_operation (GeglBuffer *src_buffer,
GimpProgress *progress,
const gchar *undo_desc,
GeglNode *operation,
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect);
#endif /* __GIMP_APPLY_OPERATION_H__ */
#endif /* __GIMP_GEGL_APPLY_OPERATION_H__ */

1
app/paint/gimppaintcore.c
View File

@ -32,7 +32,6 @@
#include "gegl/gimpapplicator.h"
#include "core/gimp.h"
#include "core/gimp-apply-operation.h"
#include "core/gimp-utils.h"
#include "core/gimpchannel.h"
#include "core/gimpimage.h"

1
app/paint/gimpperspectiveclone.c
View File

@ -32,7 +32,6 @@
#include "core/gimp.h"
#include "core/gimp-utils.h"
#include "core/gimp-apply-operation.h"
#include "core/gimpdrawable.h"
#include "core/gimperror.h"
#include "core/gimpimage.h"