[gimp] app: rename gimp_gegl_combine_mask() to gimp_gegl_combine_mask_weird()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename gimp_gegl_combine_mask() to gimp_gegl_combine_mask_weird()
- Date: Sun, 6 May 2012 20:52:31 +0000 (UTC)
commit 5738c866a119246cd7d9e9e90229064cea87e40c
Author: Michael Natterer <mitch gimp org>
Date: Sun May 6 19:57:20 2012 +0200
app: rename gimp_gegl_combine_mask() to gimp_gegl_combine_mask_weird()
because it is.
app/gegl/gimp-gegl-loops.c | 12 +++---
app/gegl/gimp-gegl-loops.h | 88 ++++++++++++++++++++++----------------------
app/paint/gimppaintcore.c | 28 +++++++-------
3 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-loops.c b/app/gegl/gimp-gegl-loops.c
index 785bfa8..f656df3 100644
--- a/app/gegl/gimp-gegl-loops.c
+++ b/app/gegl/gimp-gegl-loops.c
@@ -425,12 +425,12 @@ gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
}
void
-gimp_gegl_combine_mask (GeglBuffer *mask_buffer,
- const GeglRectangle *mask_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- gdouble opacity,
- gboolean stipple)
+gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer,
+ const GeglRectangle *mask_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ gdouble opacity,
+ gboolean stipple)
{
GeglBufferIterator *iter;
diff --git a/app/gegl/gimp-gegl-loops.h b/app/gegl/gimp-gegl-loops.h
index 264a5a9..1178be1 100644
--- a/app/gegl/gimp-gegl-loops.h
+++ b/app/gegl/gimp-gegl-loops.h
@@ -25,55 +25,55 @@
/* this is a pretty stupid port of concolve_region() that only works
* on a linear source buffer
*/
-void gimp_gegl_convolve (GeglBuffer *src_buffer,
- const GeglRectangle *src_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- const gfloat *kernel,
- gint kernel_size,
- gdouble divisor,
- GimpConvolutionType mode,
- gboolean alpha_weighting);
+void gimp_gegl_convolve (GeglBuffer *src_buffer,
+ const GeglRectangle *src_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ const gfloat *kernel,
+ gint kernel_size,
+ gdouble divisor,
+ GimpConvolutionType mode,
+ gboolean alpha_weighting);
-void gimp_gegl_dodgeburn (GeglBuffer *src_buffer,
- const GeglRectangle *src_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- gdouble exposure,
- GimpDodgeBurnType type,
- GimpTransferMode mode);
+void gimp_gegl_dodgeburn (GeglBuffer *src_buffer,
+ const GeglRectangle *src_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ gdouble exposure,
+ GimpDodgeBurnType type,
+ GimpTransferMode mode);
-void gimp_gegl_smudge_blend (GeglBuffer *top_buffer,
- const GeglRectangle *top_rect,
- GeglBuffer *bottom_buffer,
- const GeglRectangle *bottom_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- guchar blend);
+void gimp_gegl_smudge_blend (GeglBuffer *top_buffer,
+ const GeglRectangle *top_rect,
+ GeglBuffer *bottom_buffer,
+ const GeglRectangle *bottom_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ guchar blend);
-void gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
- const GeglRectangle *mask_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- gdouble opacity);
+void gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
+ const GeglRectangle *mask_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ gdouble opacity);
-void gimp_gegl_combine_mask (GeglBuffer *mask_buffer,
- const GeglRectangle *mask_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- gdouble opacity,
- gboolean stipple);
+void gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer,
+ const GeglRectangle *mask_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ gdouble opacity,
+ gboolean stipple);
-void gimp_gegl_replace (GeglBuffer *top_buffer,
- const GeglRectangle *top_rect,
- GeglBuffer *bottom_buffer,
- const GeglRectangle *bottom_rect,
- GeglBuffer *mask_buffer,
- const GeglRectangle *mask_rect,
- GeglBuffer *dest_buffer,
- const GeglRectangle *dest_rect,
- guchar opacity,
- const gboolean *affect);
+void gimp_gegl_replace (GeglBuffer *top_buffer,
+ const GeglRectangle *top_rect,
+ GeglBuffer *bottom_buffer,
+ const GeglRectangle *bottom_rect,
+ GeglBuffer *mask_buffer,
+ const GeglRectangle *mask_rect,
+ GeglBuffer *dest_buffer,
+ const GeglRectangle *dest_rect,
+ guchar opacity,
+ const gboolean *affect);
#endif /* __GIMP_GEGL_LOOPS_H__ */
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index 563d072..a1a8b7c 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -722,13 +722,13 @@ gimp_paint_core_paste (GimpPaintCore *core,
*/
if (paint_mask != core->canvas_buffer)
{
- gimp_gegl_combine_mask (paint_mask, paint_mask_rect,
- core->canvas_buffer,
- GEGL_RECTANGLE (core->paint_buffer_x,
- core->paint_buffer_y,
- width, height),
- paint_opacity,
- GIMP_IS_AIRBRUSH (core));
+ gimp_gegl_combine_mask_weird (paint_mask, paint_mask_rect,
+ core->canvas_buffer,
+ GEGL_RECTANGLE (core->paint_buffer_x,
+ core->paint_buffer_y,
+ width, height),
+ paint_opacity,
+ GIMP_IS_AIRBRUSH (core));
}
gimp_gegl_apply_mask (core->canvas_buffer,
@@ -819,13 +819,13 @@ gimp_paint_core_replace (GimpPaintCore *core,
paint_mask != core->canvas_buffer)
{
/* combine the paint mask and the canvas buffer */
- gimp_gegl_combine_mask (paint_mask, paint_mask_rect,
- core->canvas_buffer,
- GEGL_RECTANGLE (core->paint_buffer_x,
- core->paint_buffer_y,
- width, height),
- paint_opacity,
- GIMP_IS_AIRBRUSH (core));
+ gimp_gegl_combine_mask_weird (paint_mask, paint_mask_rect,
+ core->canvas_buffer,
+ GEGL_RECTANGLE (core->paint_buffer_x,
+ core->paint_buffer_y,
+ width, height),
+ paint_opacity,
+ GIMP_IS_AIRBRUSH (core));
/* initialize the maskPR from the canvas buffer */
paint_mask = core->canvas_buffer;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
