[gimp] app: added initial gegl version of saturation blending mode



commit cc0410a22658fdebbe05ed9177ea8585a9820614
Author: Ville Sokk <ville sokk gmail com>
Date:   Fri May 11 18:28:42 2012 +0300

    app: added initial gegl version of saturation blending mode

 app/gegl/gimp-gegl-nodes.c                   |    1 -
 app/operations/gimpoperationhuemode.c        |    9 ++---
 app/operations/gimpoperationsaturationmode.c |   44 +++++++++++++++++++++++---
 3 files changed, 43 insertions(+), 11 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index 5057665..29e2caf 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -319,7 +319,6 @@ gimp_gegl_node_set_layer_mode (GeglNode             *node,
   switch (mode)
     {
     case GIMP_BEHIND_MODE:
-    case GIMP_SATURATION_MODE:
     case GIMP_COLOR_MODE:
     case GIMP_VALUE_MODE:
     case GIMP_COLOR_ERASE_MODE:
diff --git a/app/operations/gimpoperationhuemode.c b/app/operations/gimpoperationhuemode.c
index ebf853e..2483f8f 100644
--- a/app/operations/gimpoperationhuemode.c
+++ b/app/operations/gimpoperationhuemode.c
@@ -113,15 +113,14 @@ gimp_operation_hue_mode_process (GeglOperation       *operation,
         out_hsv.h = layer_hsv.h;
       gimp_hsv_to_rgb (&out_hsv, &out_rgb);
 
-      out[0] = (gfloat) out_rgb.r;
-      out[1] = (gfloat) out_rgb.g;
-      out[2] = (gfloat) out_rgb.b;
+      out[0] = out_rgb.r;
+      out[1] = out_rgb.g;
+      out[2] = out_rgb.b;
+      out[3] = in[3];
 
       for (b = RED; b < ALPHA; b++)
         out[b] = out[b] * ratio + in[b] * (1 - ratio) + 0.0001;
 
-      out[3] = in[3];
-
       in    += 4;
       layer += 4;
       out   += 4;
diff --git a/app/operations/gimpoperationsaturationmode.c b/app/operations/gimpoperationsaturationmode.c
index d80afb8..20f142b 100644
--- a/app/operations/gimpoperationsaturationmode.c
+++ b/app/operations/gimpoperationsaturationmode.c
@@ -3,6 +3,7 @@
  *
  * gimpoperationsaturationmode.c
  * Copyright (C) 2008 Michael Natterer <mitch gimp org>
+ *               2012 Ville Sokk <ville sokk gmail com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,12 +23,17 @@
 #include "config.h"
 
 #include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
 
 #include "operations-types.h"
 
 #include "gimpoperationsaturationmode.h"
 
 
+static void     gimp_operation_saturation_mode_prepare (GeglOperation       *operation);
 static gboolean gimp_operation_saturation_mode_process (GeglOperation       *operation,
                                                         void                *in_buf,
                                                         void                *aux_buf,
@@ -55,7 +61,8 @@ gimp_operation_saturation_mode_class_init (GimpOperationSaturationModeClass *kla
                                  "description", "GIMP saturation mode operation",
                                  NULL);
 
-  point_class->process         = gimp_operation_saturation_mode_process;
+  operation_class->prepare = gimp_operation_saturation_mode_prepare;
+  point_class->process     = gimp_operation_saturation_mode_process;
 }
 
 static void
@@ -63,6 +70,16 @@ gimp_operation_saturation_mode_init (GimpOperationSaturationMode *self)
 {
 }
 
+static void
+gimp_operation_saturation_mode_prepare (GeglOperation *operation)
+{
+  const Babl *format = babl_format ("R'G'B'A float");
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "aux",    format);
+  gegl_operation_set_format (operation, "output", format);
+}
+
 static gboolean
 gimp_operation_saturation_mode_process (GeglOperation       *operation,
                                         void                *in_buf,
@@ -78,10 +95,27 @@ gimp_operation_saturation_mode_process (GeglOperation       *operation,
 
   while (samples--)
     {
-      out[RED]   = in[RED];
-      out[GREEN] = in[GREEN];
-      out[BLUE]  = in[BLUE];
-      out[ALPHA] = in[ALPHA];
+      gint    b;
+      GimpHSV layer_hsv, out_hsv;
+      GimpRGB layer_rgb  = {layer[0], layer[1], layer[2]};
+      GimpRGB out_rgb    = {in[0], in[1], in[2]};
+      gfloat  comp_alpha = MIN (in[ALPHA], layer[ALPHA]);
+      gfloat  new_alpha  = in[ALPHA] + (1 - in[ALPHA]) * comp_alpha;
+      gfloat  ratio      = comp_alpha / new_alpha;
+
+      gimp_rgb_to_hsv (&layer_rgb, &layer_hsv);
+      gimp_rgb_to_hsv (&out_rgb, &out_hsv);
+
+      out_hsv.s = layer_hsv.s;
+      gimp_hsv_to_rgb (&out_hsv, &out_rgb);
+
+      out[0] = out_rgb.r;
+      out[1] = out_rgb.g;
+      out[2] = out_rgb.b;
+      out[3] = in[3];
+
+      for (b = RED; b < ALPHA; b++)
+        out[b] = out[b] * ratio + in[b] * (1 - ratio) + 0.0001;
 
       in    += 4;
       layer += 4;



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