gimp r25728 - in trunk: . app/base app/core

[neo svn gnome org]

Author: neo
Date: Wed May 21 13:34:07 2008
New Revision: 25728
URL: http://svn.gnome.org/viewvc/gimp?rev=25728&view=rev

Log:
2008-05-21  Sven Neumann  <sven gimp org>

	* app/base/Makefile.am
	* app/base/desaturate.[ch]: moved legacy desaturate code here.

	* app/core/gimpdrawable-desaturate.c: use the code in app/base.


Added:
   trunk/app/base/desaturate.c
      - copied, changed from r25726, /trunk/app/core/gimpdrawable-desaturate.c
   trunk/app/base/desaturate.h   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/app/base/Makefile.am
   trunk/app/core/gimpdrawable-desaturate.c

Modified: trunk/app/base/Makefile.am
==============================================================================
--- trunk/app/base/Makefile.am	(original)
+++ trunk/app/base/Makefile.am	Wed May 21 13:34:07 2008
@@ -20,6 +20,8 @@
 	cpercep.h		\
 	curves.c		\
 	curves.h		\
+	desaturate.c		\
+	desaturate.h		\
 	gimphistogram.c		\
 	gimphistogram.h		\
 	gimplut.c		\

Copied: trunk/app/base/desaturate.c (from r25726, /trunk/app/core/gimpdrawable-desaturate.c)
==============================================================================
--- /trunk/app/core/gimpdrawable-desaturate.c	(original)
+++ trunk/app/base/desaturate.c	Wed May 21 13:34:07 2008
@@ -18,123 +18,17 @@
 
 #include "config.h"
 
-#include <gegl.h>
+#include <glib-object.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "core-types.h"
+#include "base-types.h"
 
-#include "base/pixel-processor.h"
-#include "base/pixel-region.h"
-
-#include "gegl/gimpdesaturateconfig.h"
-
-/* temp */
-#include "gimp.h"
-#include "gimpimage.h"
-
-#include "gimpdrawable.h"
-#include "gimpdrawable-desaturate.h"
-#include "gimpdrawable-operation.h"
-#include "gimpdrawable-shadow.h"
-
-#include "gimp-intl.h"
-
-
-static void  desaturate_region_lightness  (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
-
-static void  desaturate_region_luminosity (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
-
-static void  desaturate_region_average    (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
+#include "desaturate.h"
+#include "pixel-region.h"
 
 
 void
-gimp_drawable_desaturate (GimpDrawable       *drawable,
-                          GimpDesaturateMode  mode)
-{
-  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
-  g_return_if_fail (gimp_drawable_is_rgb (drawable));
-  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
-
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
-    {
-      GeglNode *desaturate;
-      GObject  *config;
-
-      desaturate = g_object_new (GEGL_TYPE_NODE,
-                                 "operation", "gimp-desaturate",
-                                 NULL);
-
-      config = g_object_new (GIMP_TYPE_DESATURATE_CONFIG,
-                             "mode", mode,
-                             NULL);
-
-      gegl_node_set (desaturate,
-                     "config", config,
-                     NULL);
-
-      g_object_unref (config);
-
-      gimp_drawable_apply_operation (drawable, desaturate, TRUE,
-                                     NULL, _("Desaturate"));
-
-      g_object_unref  (desaturate);
-    }
-  else
-    {
-      PixelRegion         srcPR, destPR;
-      PixelProcessorFunc  function;
-      gint                x, y;
-      gint                width, height;
-      gboolean            has_alpha;
-
-      if (! gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height))
-        return;
-
-      switch (mode)
-        {
-        case GIMP_DESATURATE_LIGHTNESS:
-          function = (PixelProcessorFunc) desaturate_region_lightness;
-          break;
-
-          break;
-        case GIMP_DESATURATE_LUMINOSITY:
-          function = (PixelProcessorFunc) desaturate_region_luminosity;
-          break;
-
-        case GIMP_DESATURATE_AVERAGE:
-          function = (PixelProcessorFunc) desaturate_region_average;
-          break;
-
-        default:
-          g_return_if_reached ();
-          return;
-        }
-
-      has_alpha = gimp_drawable_has_alpha (drawable);
-
-      pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
-                         x, y, width, height, FALSE);
-      pixel_region_init (&destPR, gimp_drawable_get_shadow_tiles (drawable),
-                         x, y, width, height, TRUE);
-
-      pixel_regions_process_parallel (function, GINT_TO_POINTER (has_alpha),
-                                      2, &srcPR, &destPR);
-
-      gimp_drawable_merge_shadow_tiles (drawable, TRUE, _("Desaturate"));
-      gimp_drawable_free_shadow_tiles (drawable);
-
-      gimp_drawable_update (drawable, x, y, width, height);
-    }
-}
-
-static void
 desaturate_region_lightness (gpointer     data,
                              PixelRegion *srcPR,
                              PixelRegion *destPR)
@@ -178,7 +72,7 @@
     }
 }
 
-static void
+void
 desaturate_region_luminosity (gpointer     data,
                               PixelRegion *srcPR,
                               PixelRegion *destPR)
@@ -216,7 +110,7 @@
     }
 }
 
-static void
+void
 desaturate_region_average (gpointer     data,
                            PixelRegion *srcPR,
                            PixelRegion *destPR)

Added: trunk/app/base/desaturate.h
==============================================================================
--- (empty file)
+++ trunk/app/base/desaturate.h	Wed May 21 13:34:07 2008
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __DESATURATE_H__
+#define __DESATURATE_H__
+
+
+void  desaturate_region_lightness  (gpointer     data,
+                                    PixelRegion *srcPR,
+                                    PixelRegion *destPR);
+void  desaturate_region_luminosity (gpointer     data,
+                                    PixelRegion *srcPR,
+                                    PixelRegion *destPR);
+void  desaturate_region_average    (gpointer     data,
+                                    PixelRegion *srcPR,
+                                    PixelRegion *destPR);
+
+
+#endif  /*  __DESATURATE_H__  */

Modified: trunk/app/core/gimpdrawable-desaturate.c
==============================================================================
--- trunk/app/core/gimpdrawable-desaturate.c	(original)
+++ trunk/app/core/gimpdrawable-desaturate.c	Wed May 21 13:34:07 2008
@@ -24,6 +24,7 @@
 
 #include "core-types.h"
 
+#include "base/desaturate.h"
 #include "base/pixel-processor.h"
 #include "base/pixel-region.h"
 
@@ -41,19 +42,6 @@
 #include "gimp-intl.h"
 
 
-static void  desaturate_region_lightness  (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
-
-static void  desaturate_region_luminosity (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
-
-static void  desaturate_region_average    (gpointer     data,
-                                           PixelRegion *srcPR,
-                                           PixelRegion *destPR);
-
-
 void
 gimp_drawable_desaturate (GimpDrawable       *drawable,
                           GimpDesaturateMode  mode)
@@ -133,121 +121,3 @@
       gimp_drawable_update (drawable, x, y, width, height);
     }
 }
-
-static void
-desaturate_region_lightness (gpointer     data,
-                             PixelRegion *srcPR,
-                             PixelRegion *destPR)
-{
-  const guchar *src       = srcPR->data;
-  guchar       *dest      = destPR->data;
-  gint          h         = srcPR->h;
-  gboolean      has_alpha = GPOINTER_TO_INT (data);
-
-  while (h--)
-    {
-      const guchar *s = src;
-      guchar       *d = dest;
-      gint          j;
-
-      for (j = 0; j < srcPR->w; j++)
-        {
-          gint min, max;
-          gint lightness;
-
-          max = MAX (s[RED_PIX], s[GREEN_PIX]);
-          max = MAX (max, s[BLUE_PIX]);
-          min = MIN (s[RED_PIX], s[GREEN_PIX]);
-          min = MIN (min, s[BLUE_PIX]);
-
-          lightness = (max + min) / 2;
-
-          d[RED_PIX]   = lightness;
-          d[GREEN_PIX] = lightness;
-          d[BLUE_PIX]  = lightness;
-
-          if (has_alpha)
-            d[ALPHA_PIX] = s[ALPHA_PIX];
-
-          d += destPR->bytes;
-          s += srcPR->bytes;
-        }
-
-      src += srcPR->rowstride;
-      dest += destPR->rowstride;
-    }
-}
-
-static void
-desaturate_region_luminosity (gpointer     data,
-                              PixelRegion *srcPR,
-                              PixelRegion *destPR)
-{
-  const guchar *src       = srcPR->data;
-  guchar       *dest      = destPR->data;
-  gint          h         = srcPR->h;
-  gboolean      has_alpha = GPOINTER_TO_INT (data);
-
-  while (h--)
-    {
-      const guchar *s = src;
-      guchar       *d = dest;
-      gint          j;
-
-      for (j = 0; j < srcPR->w; j++)
-        {
-          gint luminosity = GIMP_RGB_LUMINANCE (s[RED_PIX],
-                                                s[GREEN_PIX],
-                                                s[BLUE_PIX]) + 0.5;
-
-          d[RED_PIX]   = luminosity;
-          d[GREEN_PIX] = luminosity;
-          d[BLUE_PIX]  = luminosity;
-
-          if (has_alpha)
-            d[ALPHA_PIX] = s[ALPHA_PIX];
-
-          d += destPR->bytes;
-          s += srcPR->bytes;
-        }
-
-      src += srcPR->rowstride;
-      dest += destPR->rowstride;
-    }
-}
-
-static void
-desaturate_region_average (gpointer     data,
-                           PixelRegion *srcPR,
-                           PixelRegion *destPR)
-{
-  const guchar *src       = srcPR->data;
-  guchar       *dest      = destPR->data;
-  gint          h         = srcPR->h;
-  gboolean      has_alpha = GPOINTER_TO_INT (data);
-
-  while (h--)
-    {
-      const guchar *s = src;
-      guchar       *d = dest;
-      gint          j;
-
-      for (j = 0; j < srcPR->w; j++)
-        {
-          gint average = (s[RED_PIX] + s[GREEN_PIX] + s[BLUE_PIX] + 1) / 3;
-
-          d[RED_PIX]   = average;
-          d[GREEN_PIX] = average;
-          d[BLUE_PIX]  = average;
-
-          if (has_alpha)
-            d[ALPHA_PIX] = s[ALPHA_PIX];
-
-          d += destPR->bytes;
-          s += srcPR->bytes;
-        }
-
-      src += srcPR->rowstride;
-      dest += destPR->rowstride;
-    }
-}