gimp r27284 - in trunk: . app app/core app/gegl app/tools

[mitch svn gnome org]

Author: mitch
Date: Tue Oct 14 22:44:42 2008
New Revision: 27284
URL: http://svn.gnome.org/viewvc/gimp?rev=27284&view=rev

Log:
2008-10-14  Michael Natterer  <mitch gimp org>

	* configure.in
	* app/sanity.c: require GEGL >= 0.0.21.

	* app/core/gimpchannel.c
	* app/core/gimpdrawable-brightness-contrast.c
	* app/core/gimpdrawable-invert.c
	* app/core/gimpimage.c
	* app/core/gimpimagemap.c
	* app/core/gimplayer.c
	* app/gegl/gimp-gegl-utils.c
	* app/tools/gimpbrightnesscontrasttool.c: GEGL operation names
	are now "gegl:"-prefixed.

	* app/core/gimpimagemap.c: set the node's "dont-cache" property
	unconditionally.



Modified:
   trunk/ChangeLog
   trunk/app/core/gimpchannel.c
   trunk/app/core/gimpdrawable-brightness-contrast.c
   trunk/app/core/gimpdrawable-invert.c
   trunk/app/core/gimpdrawable.c
   trunk/app/core/gimpimage.c
   trunk/app/core/gimpimagemap.c
   trunk/app/core/gimplayer.c
   trunk/app/gegl/gimp-gegl-utils.c
   trunk/app/sanity.c
   trunk/app/tools/gimpbrightnesscontrasttool.c
   trunk/configure.in

Modified: trunk/app/core/gimpchannel.c
==============================================================================
--- trunk/app/core/gimpchannel.c	(original)
+++ trunk/app/core/gimpchannel.c	Tue Oct 14 22:44:42 2008
@@ -853,20 +853,20 @@
                        channel->color.a);
 
   channel->color_node = gegl_node_new_child (node,
-                                             "operation", "color",
+                                             "operation", "gegl:color",
                                              "value",     color,
                                              NULL);
 
   g_object_unref (color);
 
   channel->mask_node = gegl_node_new_child (node,
-                                            "operation", "opacity",
+                                            "operation", "gegl:opacity",
                                             NULL);
   gegl_node_connect_to (channel->color_node, "output",
                         channel->mask_node,  "input");
 
   channel->invert_node = gegl_node_new_child (node,
-                                              "operation", "invert",
+                                              "operation", "gegl:invert",
                                               NULL);
 
   if (channel->show_masked)

Modified: trunk/app/core/gimpdrawable-brightness-contrast.c
==============================================================================
--- trunk/app/core/gimpdrawable-brightness-contrast.c	(original)
+++ trunk/app/core/gimpdrawable-brightness-contrast.c	Tue Oct 14 22:44:42 2008
@@ -63,7 +63,7 @@
       GeglNode *node;
 
       node = g_object_new (GEGL_TYPE_NODE,
-                           "operation", "brightness-contrast",
+                           "operation", "gegl:brightness-contrast",
                            NULL);
       gimp_brightness_contrast_config_set_node (config, node);
 

Modified: trunk/app/core/gimpdrawable-invert.c
==============================================================================
--- trunk/app/core/gimpdrawable-invert.c	(original)
+++ trunk/app/core/gimpdrawable-invert.c	Tue Oct 14 22:44:42 2008
@@ -50,7 +50,7 @@
     {
       GeglNode *invert;
 
-      invert = g_object_new (GEGL_TYPE_NODE, "operation", "invert", NULL);
+      invert = g_object_new (GEGL_TYPE_NODE, "operation", "gegl:invert", NULL);
 
       gimp_drawable_apply_operation (drawable, progress, _("Invert"),
                                      invert, TRUE);

Modified: trunk/app/core/gimpdrawable.c
==============================================================================
--- trunk/app/core/gimpdrawable.c	(original)
+++ trunk/app/core/gimpdrawable.c	Tue Oct 14 22:44:42 2008
@@ -786,7 +786,7 @@
   drawable->node = gegl_node_new ();
 
   drawable->mode_node = gegl_node_new_child (drawable->node,
-                                             "operation", "normal",
+                                             "operation", "gegl:normal",
                                              NULL);
 
   input  = gegl_node_get_input_proxy  (drawable->node, "input");

Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c	(original)
+++ trunk/app/core/gimpimage.c	Tue Oct 14 22:44:42 2008
@@ -2571,7 +2571,7 @@
   gegl_node_add_child (image->graph, channels_node);
 
   blend_node = gegl_node_new_child (image->graph,
-                                    "operation", "normal",
+                                    "operation", "gegl:normal",
                                     NULL);
 
   gegl_node_connect_to (layers_node,   "output",

Modified: trunk/app/core/gimpimagemap.c
==============================================================================
--- trunk/app/core/gimpimagemap.c	(original)
+++ trunk/app/core/gimpimagemap.c	Tue Oct 14 22:44:42 2008
@@ -457,9 +457,9 @@
         {
           image_map->gegl = gegl_node_new ();
 
-          if (g_object_class_find_property (
-              G_OBJECT_GET_CLASS (image_map->gegl), "dont-cache"))
-            g_object_set (image_map->gegl, "dont-cache", TRUE, NULL);
+          g_object_set (image_map->gegl,
+                        "dont-cache", TRUE,
+                        NULL);
 
           image_map->input =
             gegl_node_new_child (image_map->gegl,
@@ -468,7 +468,7 @@
 
           image_map->shift =
             gegl_node_new_child (image_map->gegl,
-                                 "operation", "shift",
+                                 "operation", "gegl:shift",
                                  NULL);
 
           gegl_node_add_child (image_map->gegl, image_map->operation);
@@ -511,7 +511,7 @@
                *  pixels.
                */
               GeglNode *over = gegl_node_new_child (image_map->gegl,
-                                                    "operation", "over",
+                                                    "operation", "gegl:over",
                                                     NULL);
 
               gegl_node_link_many (image_map->input,

Modified: trunk/app/core/gimplayer.c
==============================================================================
--- trunk/app/core/gimplayer.c	(original)
+++ trunk/app/core/gimplayer.c	Tue Oct 14 22:44:42 2008
@@ -529,7 +529,7 @@
       mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
 
       layer->mask_node = gegl_node_new_child (node,
-                                              "operation", "opacity",
+                                              "operation", "gegl:opacity",
                                               NULL);
       gegl_node_connect_to (mask,             "output",
                             layer->mask_node, "aux");
@@ -539,7 +539,7 @@
 
   gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
   layer->shift_node = gegl_node_new_child (node,
-                                           "operation", "shift",
+                                           "operation", "gegl:shift",
                                            "x",         (gdouble) off_x,
                                            "y",         (gdouble) off_y,
                                            NULL);
@@ -552,7 +552,7 @@
                           layer->shift_node, "input");
 
   layer->opacity_node = gegl_node_new_child (node,
-                                             "operation", "opacity",
+                                             "operation", "gegl:opacity",
                                              "value",     layer->opacity,
                                              NULL);
   gegl_node_connect_to (layer->shift_node,   "output",
@@ -1381,7 +1381,7 @@
       node = gimp_drawable_get_node (GIMP_DRAWABLE (layer));
 
       layer->mask_node = gegl_node_new_child (node,
-                                              "operation", "opacity",
+                                              "operation", "gegl:opacity",
                                               NULL);
 
       source = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer));

Modified: trunk/app/gegl/gimp-gegl-utils.c
==============================================================================
--- trunk/app/gegl/gimp-gegl-utils.c	(original)
+++ trunk/app/gegl/gimp-gegl-utils.c	Tue Oct 14 22:44:42 2008
@@ -81,7 +81,7 @@
 {
   switch (mode)
     {
-    case GIMP_NORMAL_MODE:        return "normal";
+    case GIMP_NORMAL_MODE:        return "gegl:normal";
     case GIMP_DISSOLVE_MODE:      return "gimp-dissolve-mode";
     case GIMP_BEHIND_MODE:        return "gimp-behind-mode";
     case GIMP_MULTIPLY_MODE:      return "gimp-multiply-mode";
@@ -111,5 +111,5 @@
       break;
     }
 
-  return "normal";
+  return "gegl:normal";
 }

Modified: trunk/app/sanity.c
==============================================================================
--- trunk/app/sanity.c	(original)
+++ trunk/app/sanity.c	Tue Oct 14 22:44:42 2008
@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -298,7 +297,7 @@
 
 #define GEGL_REQUIRED_MAJOR 0
 #define GEGL_REQUIRED_MINOR 0
-#define GEGL_REQUIRED_MICRO 18
+#define GEGL_REQUIRED_MICRO 21
 
   gegl_get_version (&gegl_major_version,
                     &gegl_minor_version,

Modified: trunk/app/tools/gimpbrightnesscontrasttool.c
==============================================================================
--- trunk/app/tools/gimpbrightnesscontrasttool.c	(original)
+++ trunk/app/tools/gimpbrightnesscontrasttool.c	Tue Oct 14 22:44:42 2008
@@ -206,7 +206,7 @@
                            G_OBJECT (bc_tool), 0);
 
   return g_object_new (GEGL_TYPE_NODE,
-                       "operation", "brightness-contrast",
+                       "operation", "gegl:brightness-contrast",
                        NULL);
 }
 
@@ -375,7 +375,7 @@
   else if (! strcmp (pspec->name, "contrast"))
     {
       gtk_adjustment_set_value (bc_tool->contrast_data,
-                                config->contrast   * 127.0);
+                                config->contrast * 127.0);
     }
 
   gimp_image_map_tool_preview (GIMP_IMAGE_MAP_TOOL (bc_tool));

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 14 22:44:42 2008
@@ -41,7 +41,7 @@
 
 # required versions of other packages
 m4_define([babl_required_version], [0.0.22])
-m4_define([gegl_required_version], [0.0.18])
+m4_define([gegl_required_version], [0.0.21])
 m4_define([glib_required_version], [2.16.1])
 m4_define([gtk_required_version], [2.12.5])
 m4_define([gdk_pixbuf_required_version], [gtk_required_version])