[gimp/gimp-2-10] app: convert gimp-gegl-mask-combine to C++

[Ell <ell src gnome org>]

commit 15e8b53f0ca8b0df3d70a1d0466051d53080fbca
Author: Ell <ell_se yahoo com>
Date:   Tue Mar 19 16:11:34 2019 -0400

    app: convert gimp-gegl-mask-combine to C++
    
    ... in preparation for next commits.
    
    (cherry picked from commit 5198d3c32dbd86855131aa7e7811c99df539c34d)

 app/gegl/Makefile.am                                  |  2 +-
 ...-gegl-mask-combine.c => gimp-gegl-mask-combine.cc} | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index f7fca48d67..e4020563c1 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -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               \
diff --git a/app/gegl/gimp-gegl-mask-combine.c b/app/gegl/gimp-gegl-mask-combine.cc
similarity index 96%
rename from app/gegl/gimp-gegl-mask-combine.c
rename to app/gegl/gimp-gegl-mask-combine.cc
index 7a408ec7a1..125994d0e9 100644
--- a/app/gegl/gimp-gegl-mask-combine.c
+++ b/app/gegl/gimp-gegl-mask-combine.cc
@@ -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;
@@ -439,8 +442,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--)
@@ -458,8 +461,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--)
@@ -478,8 +481,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--)
@@ -499,3 +502,5 @@ gimp_gegl_mask_combine_buffer (GeglBuffer     *mask,
 
   return TRUE;
 }
+
+} /* extern "C" */