[gimp] app: add gimp_brush_core_get_brush_pixmap()



commit fcd19a2aeb655a1f5455122d11233c204934641c
Author: Ell <ell_se yahoo com>
Date:   Wed May 15 09:59:03 2019 -0400

    app: add gimp_brush_core_get_brush_pixmap()
    
    In GimpBrushCore, replace the private
    gimp_brush_core_transform_pixmap() function with a public
    gimp_brush_core_get_brush_pixmap() function, which, similarly to
    gimp_brush_core_get_brush_mask(), returns the transformed brush
    pixmap, and can be used by subclasses.

 app/paint/gimpbrushcore.c | 59 ++++++++++++++++++++++-------------------------
 app/paint/gimpbrushcore.h |  3 +++
 2 files changed, 30 insertions(+), 32 deletions(-)
---
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index e588f4bbe0..6f67da979b 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -103,10 +103,6 @@ static const GimpTempBuf *
                  gimp_brush_core_transform_mask     (GimpBrushCore     *core,
                                                      GimpBrush         *brush,
                                                      GeglNode          *op);
-static const GimpTempBuf *
-                 gimp_brush_core_transform_pixmap   (GimpBrushCore     *core,
-                                                     GimpBrush         *brush,
-                                                     GeglNode          *op);
 
 static void      gimp_brush_core_invalidate_cache   (GimpBrush         *brush,
                                                      GimpBrushCore     *core);
@@ -1046,33 +1042,6 @@ gimp_brush_core_transform_mask (GimpBrushCore *core,
   return core->transform_brush;
 }
 
-static const GimpTempBuf *
-gimp_brush_core_transform_pixmap (GimpBrushCore *core,
-                                  GimpBrush     *brush,
-                                  GeglNode      *op)
-{
-  const GimpTempBuf *pixmap;
-
-  if (core->scale <= 0.0)
-    return NULL;
-
-  pixmap = gimp_brush_transform_pixmap (brush,
-                                        op,
-                                        core->scale,
-                                        core->aspect_ratio,
-                                        core->angle,
-                                        core->reflect,
-                                        core->hardness);
-
-  if (pixmap == core->transform_pixmap)
-    return pixmap;
-
-  core->transform_pixmap        = pixmap;
-  core->subsample_cache_invalid = TRUE;
-
-  return core->transform_pixmap;
-}
-
 const GimpTempBuf *
 gimp_brush_core_get_brush_mask (GimpBrushCore            *core,
                                 const GimpCoords         *coords,
@@ -1115,6 +1084,32 @@ gimp_brush_core_get_brush_mask (GimpBrushCore            *core,
   g_return_val_if_reached (NULL);
 }
 
+const GimpTempBuf *
+gimp_brush_core_get_brush_pixmap (GimpBrushCore *core,
+                                  GeglNode      *op)
+{
+  const GimpTempBuf *pixmap;
+
+  if (core->scale <= 0.0)
+    return NULL;
+
+  pixmap = gimp_brush_transform_pixmap (core->brush,
+                                        op,
+                                        core->scale,
+                                        core->aspect_ratio,
+                                        core->angle,
+                                        core->reflect,
+                                        core->hardness);
+
+  if (pixmap == core->transform_pixmap)
+    return pixmap;
+
+  core->transform_pixmap        = pixmap;
+  core->subsample_cache_invalid = TRUE;
+
+  return core->transform_pixmap;
+}
+
 void
 gimp_brush_core_eval_transform_dynamics (GimpBrushCore     *core,
                                          GimpDrawable      *drawable,
@@ -1238,7 +1233,7 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore    *core,
   g_return_if_fail (gimp_brush_get_pixmap (core->brush) != NULL);
 
   /*  scale the brush  */
-  pixmap = gimp_brush_core_transform_pixmap (core, core->brush, op);
+  pixmap = gimp_brush_core_get_brush_pixmap (core, op);
 
   if (! pixmap)
     return;
diff --git a/app/paint/gimpbrushcore.h b/app/paint/gimpbrushcore.h
index b46a1080ae..662c3229fa 100644
--- a/app/paint/gimpbrushcore.h
+++ b/app/paint/gimpbrushcore.h
@@ -136,6 +136,9 @@ const GimpTempBuf * gimp_brush_core_get_brush_mask
                                        GeglNode                 *op,
                                        GimpBrushApplicationMode  brush_hardness,
                                        gdouble                   dynamic_hardness);
+const GimpTempBuf * gimp_brush_core_get_brush_pixmap
+                                      (GimpBrushCore            *core,
+                                       GeglNode                 *op);
 
 void   gimp_brush_core_eval_transform_dynamics
                                       (GimpBrushCore            *paint_core,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]