gimp r27840 - in trunk: app/core app/dialogs app/pdb app/text app/tools app/vectors tools/pdbgen/pdb

[martinn svn gnome org]

Author: martinn
Date: Sun Dec 28 00:09:33 2008
New Revision: 27840
URL: http://svn.gnome.org/viewvc/gimp?rev=27840&view=rev

Log:
Use gimp_item_set/get_image() instead of accessing the instance
member directly.

* app/core/gimpchannel.c
* app/core/gimpdrawable-brightness-contrast.c
* app/core/gimpdrawable-color-balance.c
* app/core/gimpdrawable-colorize.c
* app/core/gimpdrawable-curves.c
* app/core/gimpdrawable-desaturate.c
* app/core/gimpdrawable-hue-saturation.c
* app/core/gimpdrawable-invert.c
* app/core/gimpdrawable-levels.c
* app/core/gimpdrawable-posterize.c
* app/core/gimpdrawable-threshold.c
* app/core/gimplayer.c
* app/core/gimplayermask.c
* app/core/gimpselection.c
* app/dialogs/layer-add-mask-dialog.c
* app/text/gimptextlayer-xcf.c
* app/tools/gimprectangletool.c
* app/tools/gimptexttool.c
* app/tools/gimpvectortool.c
* app/vectors/gimpvectors-preview.c
* app/vectors/gimpvectors.c
* tools/pdbgen/pdb/layer.pdb

* app/pdb/layer-cmds.c: Regenerated.


Modified:
   trunk/app/core/gimpchannel.c
   trunk/app/core/gimpdrawable-brightness-contrast.c
   trunk/app/core/gimpdrawable-color-balance.c
   trunk/app/core/gimpdrawable-colorize.c
   trunk/app/core/gimpdrawable-curves.c
   trunk/app/core/gimpdrawable-desaturate.c
   trunk/app/core/gimpdrawable-hue-saturation.c
   trunk/app/core/gimpdrawable-invert.c
   trunk/app/core/gimpdrawable-levels.c
   trunk/app/core/gimpdrawable-posterize.c
   trunk/app/core/gimpdrawable-threshold.c
   trunk/app/core/gimplayer.c
   trunk/app/core/gimplayermask.c
   trunk/app/core/gimpselection.c
   trunk/app/dialogs/layer-add-mask-dialog.c
   trunk/app/pdb/layer-cmds.c
   trunk/app/text/gimptextlayer-xcf.c
   trunk/app/tools/gimprectangletool.c
   trunk/app/tools/gimptexttool.c
   trunk/app/tools/gimpvectortool.c
   trunk/app/vectors/gimpvectors-preview.c
   trunk/app/vectors/gimpvectors.c
   trunk/tools/pdbgen/pdb/layer.pdb

Modified: trunk/app/core/gimpchannel.c
==============================================================================
--- trunk/app/core/gimpchannel.c	(original)
+++ trunk/app/core/gimpchannel.c	Sun Dec 28 00:09:33 2008
@@ -376,8 +376,8 @@
 static gboolean
 gimp_channel_is_attached (GimpItem *item)
 {
-  return (GIMP_IS_IMAGE (item->image) &&
-          gimp_container_have (item->image->channels, GIMP_OBJECT (item)));
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          gimp_container_have (gimp_item_get_image (item)->channels, GIMP_OBJECT (item)));
 }
 
 static GimpItem *

Modified: trunk/app/core/gimpdrawable-brightness-contrast.c
==============================================================================
--- trunk/app/core/gimpdrawable-brightness-contrast.c	(original)
+++ trunk/app/core/gimpdrawable-brightness-contrast.c	Sun Dec 28 00:09:33 2008
@@ -58,7 +58,7 @@
                          "contrast",   contrast   / 127.0,
                          NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-color-balance.c
==============================================================================
--- trunk/app/core/gimpdrawable-color-balance.c	(original)
+++ trunk/app/core/gimpdrawable-color-balance.c	Sun Dec 28 00:09:33 2008
@@ -66,7 +66,7 @@
                 "yellow-blue",   yellow_blue   / 100.0,
                 NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-colorize.c
==============================================================================
--- trunk/app/core/gimpdrawable-colorize.c	(original)
+++ trunk/app/core/gimpdrawable-colorize.c	Sun Dec 28 00:09:33 2008
@@ -59,7 +59,7 @@
                          "lightness",  lightness  / 100.0,
                          NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-curves.c
==============================================================================
--- trunk/app/core/gimpdrawable-curves.c	(original)
+++ trunk/app/core/gimpdrawable-curves.c	Sun Dec 28 00:09:33 2008
@@ -151,7 +151,7 @@
                       GimpProgress     *progress,
                       GimpCurvesConfig *config)
 {
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-desaturate.c
==============================================================================
--- trunk/app/core/gimpdrawable-desaturate.c	(original)
+++ trunk/app/core/gimpdrawable-desaturate.c	Sun Dec 28 00:09:33 2008
@@ -49,7 +49,7 @@
   g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
   g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *desaturate;
       GObject  *config;

Modified: trunk/app/core/gimpdrawable-hue-saturation.c
==============================================================================
--- trunk/app/core/gimpdrawable-hue-saturation.c	(original)
+++ trunk/app/core/gimpdrawable-hue-saturation.c	Sun Dec 28 00:09:33 2008
@@ -64,7 +64,7 @@
                 "lightness",  lightness  / 100.0,
                 NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-invert.c
==============================================================================
--- trunk/app/core/gimpdrawable-invert.c	(original)
+++ trunk/app/core/gimpdrawable-invert.c	Sun Dec 28 00:09:33 2008
@@ -46,7 +46,7 @@
   g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
   g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *invert;
 

Modified: trunk/app/core/gimpdrawable-levels.c
==============================================================================
--- trunk/app/core/gimpdrawable-levels.c	(original)
+++ trunk/app/core/gimpdrawable-levels.c	Sun Dec 28 00:09:33 2008
@@ -139,7 +139,7 @@
                                GimpProgress     *progress,
                                GimpLevelsConfig *config)
 {
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *levels;
 

Modified: trunk/app/core/gimpdrawable-posterize.c
==============================================================================
--- trunk/app/core/gimpdrawable-posterize.c	(original)
+++ trunk/app/core/gimpdrawable-posterize.c	Sun Dec 28 00:09:33 2008
@@ -56,7 +56,7 @@
                          "levels", levels,
                          NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimpdrawable-threshold.c
==============================================================================
--- trunk/app/core/gimpdrawable-threshold.c	(original)
+++ trunk/app/core/gimpdrawable-threshold.c	Sun Dec 28 00:09:33 2008
@@ -57,7 +57,7 @@
                          "high", high / 255.0,
                          NULL);
 
-  if (gimp_use_gegl (GIMP_ITEM (drawable)->image->gimp))
+  if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
     {
       GeglNode *node;
 

Modified: trunk/app/core/gimplayer.c
==============================================================================
--- trunk/app/core/gimplayer.c	(original)
+++ trunk/app/core/gimplayer.c	Sun Dec 28 00:09:33 2008
@@ -539,8 +539,8 @@
 static gboolean
 gimp_layer_is_attached (GimpItem *item)
 {
-  return (GIMP_IS_IMAGE (item->image) &&
-          gimp_container_have (item->image->layers, GIMP_OBJECT (item)));
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          gimp_container_have (gimp_item_get_image (item)->layers, GIMP_OBJECT (item)));
 }
 
 static GimpItem *

Modified: trunk/app/core/gimplayermask.c
==============================================================================
--- trunk/app/core/gimplayermask.c	(original)
+++ trunk/app/core/gimplayermask.c	Sun Dec 28 00:09:33 2008
@@ -121,9 +121,9 @@
   GimpLayerMask *mask  = GIMP_LAYER_MASK (item);
   GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
 
-  return (GIMP_IS_IMAGE (item->image)         &&
-          GIMP_IS_LAYER (layer)               &&
-          gimp_layer_get_mask (layer) == mask &&
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          GIMP_IS_LAYER (layer)                      &&
+          gimp_layer_get_mask (layer) == mask        &&
           gimp_item_is_attached (GIMP_ITEM (layer)));
 }
 
@@ -233,7 +233,7 @@
 
   if (layer_mask->apply_mask != apply)
     {
-      GimpImage *image = GIMP_ITEM (layer_mask)->image;
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer_mask));
 
       if (push_undo)
         gimp_image_undo_push_layer_mask_apply (image, _("Apply Layer Mask"),
@@ -288,7 +288,7 @@
 static void
 gimp_layer_mask_real_edit_changed (GimpLayerMask *layer_mask)
 {
-  gimp_image_selection_control (GIMP_ITEM (layer_mask)->image,
+  gimp_image_selection_control (gimp_item_get_image (GIMP_ITEM (layer_mask)),
                                 GIMP_SELECTION_LAYER_ON);
 }
 
@@ -301,7 +301,7 @@
 
   if (layer_mask->show_mask != show)
     {
-      GimpImage *image = GIMP_ITEM (layer_mask)->image;
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer_mask));
 
       if (push_undo)
         gimp_image_undo_push_layer_mask_show (image, _("Show Layer Mask"),

Modified: trunk/app/core/gimpselection.c
==============================================================================
--- trunk/app/core/gimpselection.c	(original)
+++ trunk/app/core/gimpselection.c	Sun Dec 28 00:09:33 2008
@@ -185,8 +185,8 @@
 static gboolean
 gimp_selection_is_attached (GimpItem *item)
 {
-  return (GIMP_IS_IMAGE (item->image) &&
-          gimp_image_get_mask (item->image) == GIMP_CHANNEL (item));
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          gimp_image_get_mask (gimp_item_get_image (item)) == GIMP_CHANNEL (item));
 }
 
 static void

Modified: trunk/app/dialogs/layer-add-mask-dialog.c
==============================================================================
--- trunk/app/dialogs/layer-add-mask-dialog.c	(original)
+++ trunk/app/dialogs/layer-add-mask-dialog.c	Sun Dec 28 00:09:33 2008
@@ -118,7 +118,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  combo = gimp_container_combo_box_new (GIMP_ITEM (layer)->image->channels,
+  combo = gimp_container_combo_box_new (gimp_item_get_image (GIMP_ITEM (layer))->channels,
                                         context,
                                         GIMP_VIEW_SIZE_SMALL, 1);
   gimp_enum_radio_frame_add (GTK_FRAME (frame), combo,
@@ -129,10 +129,10 @@
                     G_CALLBACK (layer_add_mask_dialog_channel_selected),
                     dialog);
 
-  channel = gimp_image_get_active_channel (GIMP_ITEM (layer)->image);
+  channel = gimp_image_get_active_channel (gimp_item_get_image (GIMP_ITEM (layer)));
 
   if (! channel)
-    channel = GIMP_CHANNEL (gimp_container_get_first_child (GIMP_ITEM (layer)->image->channels));
+    channel = GIMP_CHANNEL (gimp_container_get_first_child (gimp_item_get_image (GIMP_ITEM (layer))->channels));
 
   gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo),
                                    GIMP_VIEWABLE (channel));

Modified: trunk/app/pdb/layer-cmds.c
==============================================================================
--- trunk/app/pdb/layer-cmds.c	(original)
+++ trunk/app/pdb/layer-cmds.c	Sun Dec 28 00:09:33 2008
@@ -510,7 +510,7 @@
 
       if (mask_type == GIMP_ADD_CHANNEL_MASK)
         {
-          channel = gimp_image_get_active_channel (GIMP_ITEM (layer)->image);
+          channel = gimp_image_get_active_channel (gimp_item_get_image (GIMP_ITEM (layer)));
 
           if (! channel)
             success = FALSE;

Modified: trunk/app/text/gimptextlayer-xcf.c
==============================================================================
--- trunk/app/text/gimptextlayer-xcf.c	(original)
+++ trunk/app/text/gimptextlayer-xcf.c	Sun Dec 28 00:09:33 2008
@@ -192,12 +192,15 @@
                         gimp_object_get_name (GIMP_OBJECT (layer)));
 
   item->ID    = gimp_item_get_ID (GIMP_ITEM (layer));
-  item->image = gimp_item_get_image (GIMP_ITEM (layer));
 
+  /* Set image before tatoo so that the explicitly set tatoo overrides
+   * the one implicitly set when setting the image
+   */
+  gimp_item_set_image (item, gimp_item_get_image (GIMP_ITEM (layer)));
   gimp_item_set_tattoo (item, gimp_item_get_tattoo (GIMP_ITEM (layer)));
 
   gimp_item_set_image (GIMP_ITEM (layer), NULL);
-  g_hash_table_replace (item->image->gimp->item_table,
+  g_hash_table_replace (gimp_item_get_image (item)->gimp->item_table,
                         GINT_TO_POINTER (gimp_item_get_ID (item)),
                         item);
 

Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c	(original)
+++ trunk/app/tools/gimprectangletool.c	Sun Dec 28 00:09:33 2008
@@ -720,7 +720,7 @@
   g_return_if_fail (GIMP_IS_ITEM (item));
   g_return_if_fail (gimp_item_is_attached (item));
   g_return_if_fail (display != NULL);
-  g_return_if_fail (display->image == item->image);
+  g_return_if_fail (display->image == gimp_item_get_image (item));
 
   width  = gimp_item_get_width  (item);
   height = gimp_item_get_height (item);

Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c	(original)
+++ trunk/app/tools/gimptexttool.c	Sun Dec 28 00:09:33 2008
@@ -2127,7 +2127,7 @@
       context = gimp_get_user_context (tool->tool_info->gimp);
       display = gimp_context_get_display (context);
 
-      if (! display || display->image != item->image)
+      if (! display || display->image != gimp_item_get_image (item))
         {
           GList *list;
 
@@ -2139,7 +2139,7 @@
             {
               display = list->data;
 
-              if (display->image == item->image)
+              if (display->image == gimp_item_get_image (item))
                 {
                   gimp_context_set_display (context, display);
                   break;

Modified: trunk/app/tools/gimpvectortool.c
==============================================================================
--- trunk/app/tools/gimpvectortool.c	(original)
+++ trunk/app/tools/gimpvectortool.c	Sun Dec 28 00:09:33 2008
@@ -1552,7 +1552,7 @@
   gimp_draw_tool_pause (draw_tool);
 
   if (gimp_draw_tool_is_active (draw_tool) &&
-      (! vectors || draw_tool->display->image != item->image))
+      (! vectors || draw_tool->display->image != gimp_item_get_image (item)))
     {
       gimp_draw_tool_stop (draw_tool);
     }
@@ -1618,7 +1618,7 @@
 
   g_object_ref (vectors);
 
-  g_signal_connect_object (item->image, "active-vectors-changed",
+  g_signal_connect_object (gimp_item_get_image (item), "active-vectors-changed",
                            G_CALLBACK (gimp_vector_tool_vectors_changed),
                            vector_tool, 0);
   g_signal_connect_object (vectors, "removed",
@@ -1655,7 +1655,7 @@
 
   if (! gimp_draw_tool_is_active (draw_tool))
     {
-      if (tool->display && tool->display->image == item->image)
+      if (tool->display && tool->display->image == gimp_item_get_image (item))
         {
           gimp_draw_tool_start (draw_tool, tool->display);
         }
@@ -1667,19 +1667,19 @@
           context = gimp_get_user_context (tool->tool_info->gimp);
           display = gimp_context_get_display (context);
 
-          if (! display || display->image != item->image)
+          if (! display || display->image != gimp_item_get_image (item))
             {
               GList *list;
 
               display = NULL;
 
-              for (list = gimp_get_display_iter (item->image->gimp);
+              for (list = gimp_get_display_iter (gimp_item_get_image (item)->gimp);
                    list;
                    list = g_list_next (list))
                 {
                   display = list->data;
 
-                  if (display->image == item->image)
+                  if (display->image == gimp_item_get_image (item))
                     {
                       gimp_context_set_display (context, display);
                       break;
@@ -1872,7 +1872,7 @@
   if (vector_tool->have_undo)
     return;
 
-  gimp_image_undo_push_vectors_mod (GIMP_ITEM (vector_tool->vectors)->image,
+  gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vector_tool->vectors)),
                                     desc, vector_tool->vectors);
   vector_tool->have_undo = TRUE;
 }

Modified: trunk/app/vectors/gimpvectors-preview.c
==============================================================================
--- trunk/app/vectors/gimpvectors-preview.c	(original)
+++ trunk/app/vectors/gimpvectors-preview.c	Sun Dec 28 00:09:33 2008
@@ -54,8 +54,8 @@
   vectors = GIMP_VECTORS (viewable);
   item    = GIMP_ITEM (viewable);
 
-  xscale = ((gdouble) width)  / gimp_image_get_width  (item->image);
-  yscale = ((gdouble) height) / gimp_image_get_height (item->image);
+  xscale = ((gdouble) width)  / gimp_image_get_width  (gimp_item_get_image (item));
+  yscale = ((gdouble) height) / gimp_image_get_height (gimp_item_get_image (item));
 
   temp_buf = temp_buf_new (width, height, 1, 0, 0, white);
   data = temp_buf_get_data (temp_buf);

Modified: trunk/app/vectors/gimpvectors.c
==============================================================================
--- trunk/app/vectors/gimpvectors.c	(original)
+++ trunk/app/vectors/gimpvectors.c	Sun Dec 28 00:09:33 2008
@@ -266,8 +266,8 @@
 static gboolean
 gimp_vectors_is_attached (GimpItem *item)
 {
-  return (GIMP_IS_IMAGE (item->image) &&
-          gimp_container_have (item->image->vectors, GIMP_OBJECT (item)));
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          gimp_container_have (gimp_item_get_image (item)->vectors, GIMP_OBJECT (item)));
 }
 
 static GimpItem *

Modified: trunk/tools/pdbgen/pdb/layer.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/layer.pdb	(original)
+++ trunk/tools/pdbgen/pdb/layer.pdb	Sun Dec 28 00:09:33 2008
@@ -236,7 +236,7 @@
 
   if (mask_type == GIMP_ADD_CHANNEL_MASK)
     {
-      channel = gimp_image_get_active_channel (GIMP_ITEM (layer)->image);
+      channel = gimp_image_get_active_channel (gimp_item_get_image (GIMP_ITEM (layer)));
 
       if (! channel)
         success = FALSE;