dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: convert gimp-gegl-mask-combine to C++ 

... in preparation for next commits.
This commit is contained in:
Ell 2019-03-19 16:11:34 -04:00
parent ffaaa81c8a
commit 5198d3c32d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/gegl/Makefile.am
View File

@ -31,7 +31,7 @@ libappgegl_generic_a_sources = \
gimp-gegl-loops.h \
gimp-gegl-mask.c \
gimp-gegl-mask.h \
gimp-gegl-mask-combine.c \
gimp-gegl-mask-combine.cc \
gimp-gegl-mask-combine.h \
gimp-gegl-nodes.c \
gimp-gegl-nodes.h \

19
app/gegl/gimp-gegl-mask-combine.c → app/gegl/gimp-gegl-mask-combine.cc
View File

@ -25,6 +25,9 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
extern "C"
{
#include "gimp-gegl-types.h"
#include "gimp-babl.h"
@ -210,7 +213,7 @@ gimp_gegl_mask_combine_ellipse_rect (GeglBuffer *mask,
while (gegl_buffer_iterator_next (iter))
{
gfloat *data = iter->items[0].data;
gfloat *data = (gfloat *) iter->items[0].data;
gint py;
for (py = roi->y;
@ -443,8 +446,8 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
case GIMP_CHANNEL_OP_REPLACE:
while (gegl_buffer_iterator_next (iter))
{
gfloat *mask_data = iter->items[0].data;
const gfloat *add_on_data = iter->items[1].data;
gfloat *mask_data = (gfloat *) iter->items[0].data;
const gfloat *add_on_data = (const gfloat *) iter->items[1].data;
gint count = iter->length;
while (count--)
@ -462,8 +465,8 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
case GIMP_CHANNEL_OP_SUBTRACT:
while (gegl_buffer_iterator_next (iter))
{
gfloat *mask_data = iter->items[0].data;
const gfloat *add_on_data = iter->items[1].data;
gfloat *mask_data = (gfloat *) iter->items[0].data;
const gfloat *add_on_data = (const gfloat *) iter->items[1].data;
gint count = iter->length;
while (count--)
@ -482,8 +485,8 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
case GIMP_CHANNEL_OP_INTERSECT:
while (gegl_buffer_iterator_next (iter))
{
gfloat *mask_data = iter->items[0].data;
const gfloat *add_on_data = iter->items[1].data;
gfloat *mask_data = (gfloat *) iter->items[0].data;
const gfloat *add_on_data = (const gfloat *) iter->items[1].data;
gint count = iter->length;
while (count--)
@ -503,3 +506,5 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
return TRUE;
}
} /* extern "C" */