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

app: rename gimp_gegl_combine_mask() to gimp_gegl_combine_mask_weird()

Browse Source 
because it is.
This commit is contained in:
Michael Natterer
2012-05-06 19:57:20 +02:00
parent 0215e76acf
commit 5738c866a1
3 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/gegl/gimp-gegl-loops.c
View File

@ -425,12 +425,12 @@ gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
} }
void void
gimp_gegl_combine_mask (GeglBuffer *mask_buffer, gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
gdouble opacity, gdouble opacity,
gboolean stipple) gboolean stipple)
{ {
GeglBufferIterator *iter; GeglBufferIterator *iter;

88
app/gegl/gimp-gegl-loops.h
View File

@ -25,55 +25,55 @@
/* this is a pretty stupid port of concolve_region() that only works /* this is a pretty stupid port of concolve_region() that only works
* on a linear source buffer * on a linear source buffer
*/ */
void gimp_gegl_convolve (GeglBuffer *src_buffer, void gimp_gegl_convolve (GeglBuffer *src_buffer,
const GeglRectangle *src_rect, const GeglRectangle *src_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
const gfloat *kernel, const gfloat *kernel,
gint kernel_size, gint kernel_size,
gdouble divisor, gdouble divisor,
GimpConvolutionType mode, GimpConvolutionType mode,
gboolean alpha_weighting); gboolean alpha_weighting);
void gimp_gegl_dodgeburn (GeglBuffer *src_buffer, void gimp_gegl_dodgeburn (GeglBuffer *src_buffer,
const GeglRectangle *src_rect, const GeglRectangle *src_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
gdouble exposure, gdouble exposure,
GimpDodgeBurnType type, GimpDodgeBurnType type,
GimpTransferMode mode); GimpTransferMode mode);
void gimp_gegl_smudge_blend (GeglBuffer *top_buffer, void gimp_gegl_smudge_blend (GeglBuffer *top_buffer,
const GeglRectangle *top_rect, const GeglRectangle *top_rect,
GeglBuffer *bottom_buffer, GeglBuffer *bottom_buffer,
const GeglRectangle *bottom_rect, const GeglRectangle *bottom_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
guchar blend); guchar blend);
void gimp_gegl_apply_mask (GeglBuffer *mask_buffer, void gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
gdouble opacity); gdouble opacity);
void gimp_gegl_combine_mask (GeglBuffer *mask_buffer, void gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
gdouble opacity, gdouble opacity,
gboolean stipple); gboolean stipple);
void gimp_gegl_replace (GeglBuffer *top_buffer, void gimp_gegl_replace (GeglBuffer *top_buffer,
const GeglRectangle *top_rect, const GeglRectangle *top_rect,
GeglBuffer *bottom_buffer, GeglBuffer *bottom_buffer,
const GeglRectangle *bottom_rect, const GeglRectangle *bottom_rect,
GeglBuffer *mask_buffer, GeglBuffer *mask_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
guchar opacity, guchar opacity,
const gboolean *affect); const gboolean *affect);
#endif /* __GIMP_GEGL_LOOPS_H__ */ #endif /* __GIMP_GEGL_LOOPS_H__ */

28
app/paint/gimppaintcore.c
View File

@ -722,13 +722,13 @@ gimp_paint_core_paste (GimpPaintCore *core,
*/ */
if (paint_mask != core->canvas_buffer) if (paint_mask != core->canvas_buffer)
{ {
gimp_gegl_combine_mask (paint_mask, paint_mask_rect, gimp_gegl_combine_mask_weird (paint_mask, paint_mask_rect,
core->canvas_buffer, core->canvas_buffer,
GEGL_RECTANGLE (core->paint_buffer_x, GEGL_RECTANGLE (core->paint_buffer_x,
core->paint_buffer_y, core->paint_buffer_y,
width, height), width, height),
paint_opacity, paint_opacity,
GIMP_IS_AIRBRUSH (core)); GIMP_IS_AIRBRUSH (core));
} }
gimp_gegl_apply_mask (core->canvas_buffer, gimp_gegl_apply_mask (core->canvas_buffer,
@ -819,13 +819,13 @@ gimp_paint_core_replace (GimpPaintCore *core,
paint_mask != core->canvas_buffer) paint_mask != core->canvas_buffer)
{ {
/* combine the paint mask and the canvas buffer */ /* combine the paint mask and the canvas buffer */
gimp_gegl_combine_mask (paint_mask, paint_mask_rect, gimp_gegl_combine_mask_weird (paint_mask, paint_mask_rect,
core->canvas_buffer, core->canvas_buffer,
GEGL_RECTANGLE (core->paint_buffer_x, GEGL_RECTANGLE (core->paint_buffer_x,
core->paint_buffer_y, core->paint_buffer_y,
width, height), width, height),
paint_opacity, paint_opacity,
GIMP_IS_AIRBRUSH (core)); GIMP_IS_AIRBRUSH (core));
/* initialize the maskPR from the canvas buffer */ /* initialize the maskPR from the canvas buffer */
paint_mask = core->canvas_buffer; paint_mask = core->canvas_buffer;