GNOME.org
 

[gimp] app: use the image instead of the projection for accessing a pickable

commit 125cf2a2a3e1e85172af25871a2cda3638292fdb
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 13 23:29:06 2013 +0200

    app: use the image instead of the projection for accessing a pickable

 app/actions/image-commands.c           |    2 +-
 app/actions/layers-commands.c          |    2 +-
 app/core/gimp-edit.c                   |   14 ++++----------
 app/core/gimpchannel.c                 |   19 ++++++++-----------
 app/core/gimpimage-contiguous-region.c |    4 ++--
 app/core/gimpimage-pick-color.c        |    2 +-
 app/core/gimpimage-preview.c           |   13 ++++++-------
 app/core/gimpimagefile.c               |    2 +-
 app/core/gimppalette-import.c          |   13 +++++--------
 app/paint/gimppaintcore.c              |    3 +--
 app/paint/gimpperspectiveclone.c       |    2 +-
 app/paint/gimpsourcecore.c             |    2 +-
 app/pdb/image-cmds.c                   |    4 ++--
 app/pdb/layer-cmds.c                   |    2 +-
 app/tools/gimpbycolorselecttool.c      |    2 +-
 app/tools/gimpiscissorstool.c          |    2 +-
 app/tools/gimprectangletool.c          |    2 +-
 tools/pdbgen/pdb/image.pdb             |    4 ++--
 tools/pdbgen/pdb/layer.pdb             |    2 +-
 19 files changed, 41 insertions(+), 55 deletions(-)
---
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index 076b4b0..f7a79e1 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -517,7 +517,7 @@ image_crop_to_content_cmd_callback (GtkAction *action,
   return_if_no_image (image, data);
   return_if_no_widget (widget, data);
 
-  if (! gimp_pickable_auto_shrink (GIMP_PICKABLE (gimp_image_get_projection (image)),
+  if (! gimp_pickable_auto_shrink (GIMP_PICKABLE (image),
                                    0, 0,
                                    gimp_image_get_width  (image),
                                    gimp_image_get_height (image),
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index c494c52..9065fce 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -348,7 +348,7 @@ layers_new_from_visible_cmd_callback (GtkAction *action,
   GimpPickable *pickable;
   return_if_no_image (image, data);
 
-  pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+  pickable = GIMP_PICKABLE (image);
 
   gimp_pickable_flush (pickable);
 
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index fe7d6a3..ff26b25 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -121,16 +121,13 @@ gimp_edit_copy_visible (GimpImage    *image,
                         GimpContext  *context,
                         GError      **error)
 {
-  GimpProjection *projection;
-  GimpBuffer     *buffer;
+  GimpBuffer *buffer;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-  projection = gimp_image_get_projection (image);
-
-  buffer = gimp_edit_extract (image, GIMP_PICKABLE (projection),
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (image),
                               context, FALSE, error);
 
   if (buffer)
@@ -374,17 +371,14 @@ gimp_edit_named_copy_visible (GimpImage    *image,
                               GimpContext  *context,
                               GError      **error)
 {
-  GimpProjection *projection;
-  GimpBuffer     *buffer;
+  GimpBuffer *buffer;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
   g_return_val_if_fail (name != NULL, NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-  projection = gimp_image_get_projection (image);
-
-  buffer = gimp_edit_extract (image, GIMP_PICKABLE (projection),
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (image),
                               context, FALSE, error);
 
   if (buffer)
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 300869d..1e6a5a1 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -1616,13 +1616,12 @@ gimp_channel_new_from_component (GimpImage       *image,
                                  const gchar     *name,
                                  const GimpRGB   *color)
 {
-  GimpProjection *projection;
-  GimpChannel    *channel;
-  GeglBuffer     *src_buffer;
-  GeglBuffer     *dest_buffer;
-  gint            width;
-  gint            height;
-  const Babl     *format;
+  GimpChannel *channel;
+  GeglBuffer  *src_buffer;
+  GeglBuffer  *dest_buffer;
+  gint         width;
+  gint         height;
+  const Babl  *format;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
@@ -1630,11 +1629,9 @@ gimp_channel_new_from_component (GimpImage       *image,
 
   g_return_val_if_fail (format != NULL, NULL);
 
-  projection = gimp_image_get_projection (image);
-
-  gimp_pickable_flush (GIMP_PICKABLE (projection));
+  gimp_pickable_flush (GIMP_PICKABLE (image));
 
-  src_buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (projection));
+  src_buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (image));
   width  = gegl_buffer_get_width  (src_buffer);
   height = gegl_buffer_get_height (src_buffer);
 
diff --git a/app/core/gimpimage-contiguous-region.c b/app/core/gimpimage-contiguous-region.c
index 459d071..7c19796 100644
--- a/app/core/gimpimage-contiguous-region.c
+++ b/app/core/gimpimage-contiguous-region.c
@@ -104,7 +104,7 @@ gimp_image_contiguous_region_by_seed (GimpImage           *image,
   g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
 
   if (sample_merged)
-    pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+    pickable = GIMP_PICKABLE (image);
   else
     pickable = GIMP_PICKABLE (drawable);
 
@@ -176,7 +176,7 @@ gimp_image_contiguous_region_by_color (GimpImage            *image,
   g_return_val_if_fail (color != NULL, NULL);
 
   if (sample_merged)
-    pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+    pickable = GIMP_PICKABLE (image);
   else
     pickable = GIMP_PICKABLE (drawable);
 
diff --git a/app/core/gimpimage-pick-color.c b/app/core/gimpimage-pick-color.c
index 818bbe7..073e0a3 100644
--- a/app/core/gimpimage-pick-color.c
+++ b/app/core/gimpimage-pick-color.c
@@ -58,7 +58,7 @@ gimp_image_pick_color (GimpImage     *image,
 
   if (sample_merged)
     {
-      pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+      pickable = GIMP_PICKABLE (image);
     }
   else
     {
diff --git a/app/core/gimpimage-preview.c b/app/core/gimpimage-preview.c
index 8c98213..7b61e03 100644
--- a/app/core/gimpimage-preview.c
+++ b/app/core/gimpimage-preview.c
@@ -100,12 +100,11 @@ gimp_image_get_new_preview (GimpViewable *viewable,
                             gint          width,
                             gint          height)
 {
-  GimpImage      *image      = GIMP_IMAGE (viewable);
-  GimpProjection *projection = gimp_image_get_projection (image);
-  const Babl     *format;
-  GimpTempBuf    *buf;
-  gdouble         scale_x;
-  gdouble         scale_y;
+  GimpImage   *image = GIMP_IMAGE (viewable);
+  const Babl  *format;
+  GimpTempBuf *buf;
+  gdouble      scale_x;
+  gdouble      scale_y;
 
   scale_x = (gdouble) width  / (gdouble) gimp_image_get_width  (image);
   scale_y = (gdouble) height / (gdouble) gimp_image_get_height (image);
@@ -117,7 +116,7 @@ gimp_image_get_new_preview (GimpViewable *viewable,
 
   buf = gimp_temp_buf_new (width, height, format);
 
-  gegl_buffer_get (gimp_pickable_get_buffer (GIMP_PICKABLE (projection)),
+  gegl_buffer_get (gimp_pickable_get_buffer (GIMP_PICKABLE (image)),
                    GEGL_RECTANGLE (0, 0, width, height),
                    MIN (scale_x, scale_y),
                    gimp_temp_buf_get_format (buf),
diff --git a/app/core/gimpimagefile.c b/app/core/gimpimagefile.c
index 772fc37..dc165df 100644
--- a/app/core/gimpimagefile.c
+++ b/app/core/gimpimagefile.c
@@ -938,7 +938,7 @@ gimp_imagefile_save_thumb (GimpImagefile  *imagefile,
     }
 
   /*  we need the projection constructed NOW, not some time later  */
-  gimp_pickable_flush (GIMP_PICKABLE (gimp_image_get_projection (image)));
+  gimp_pickable_flush (GIMP_PICKABLE (image));
 
   pixbuf = gimp_viewable_get_new_pixbuf (GIMP_VIEWABLE (image),
                                          /* random context, unused */
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index 8e19914..b815e4c 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -354,10 +354,9 @@ gimp_palette_import_from_image (GimpImage   *image,
                                 gint         threshold,
                                 gboolean     selection_only)
 {
-  GimpProjection *projection;
-  GHashTable     *colors;
-  gint            x, y;
-  gint            width, height;
+  GHashTable *colors;
+  gint        x, y;
+  gint        width, height;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
@@ -365,9 +364,7 @@ gimp_palette_import_from_image (GimpImage   *image,
   g_return_val_if_fail (n_colors > 1, NULL);
   g_return_val_if_fail (threshold > 0, NULL);
 
-  projection = gimp_image_get_projection (image);
-
-  gimp_pickable_flush (GIMP_PICKABLE (projection));
+  gimp_pickable_flush (GIMP_PICKABLE (image));
 
   if (selection_only)
     {
@@ -386,7 +383,7 @@ gimp_palette_import_from_image (GimpImage   *image,
     }
 
   colors = gimp_palette_import_extract (image,
-                                        GIMP_PICKABLE (projection),
+                                        GIMP_PICKABLE (image),
                                         0, 0,
                                         selection_only,
                                         x, y, width, height,
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index 606800e..8880315 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -380,8 +380,7 @@ gimp_paint_core_start (GimpPaintCore     *core,
 
   if (core->use_saved_proj)
     {
-      GimpPickable *pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
-      GeglBuffer   *buffer   = gimp_pickable_get_buffer (pickable);
+      GeglBuffer *buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (image));
 
       core->saved_proj_buffer = gegl_buffer_dup (buffer);
     }
diff --git a/app/paint/gimpperspectiveclone.c b/app/paint/gimpperspectiveclone.c
index 897dc15..493ff83 100644
--- a/app/paint/gimpperspectiveclone.c
+++ b/app/paint/gimpperspectiveclone.c
@@ -186,7 +186,7 @@ gimp_perspective_clone_paint (GimpPaintCore    *paint_core,
                 src_image    = gimp_pickable_get_image (src_pickable);
 
                 if (options->sample_merged)
-                  src_pickable = GIMP_PICKABLE (gimp_image_get_projection (src_image));
+                  src_pickable = GIMP_PICKABLE (src_image);
 
                 dest_image = gimp_item_get_image (GIMP_ITEM (drawable));
 
diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c
index aa61869..6a500ab 100644
--- a/app/paint/gimpsourcecore.c
+++ b/app/paint/gimpsourcecore.c
@@ -391,7 +391,7 @@ gimp_source_core_motion (GimpSourceCore   *source_core,
           GimpImage *src_image = gimp_pickable_get_image (src_pickable);
           gint       off_x, off_y;
 
-          src_pickable = GIMP_PICKABLE (gimp_image_get_projection (src_image));
+          src_pickable = GIMP_PICKABLE (src_image);
 
           gimp_item_get_offset (GIMP_ITEM (source_core->src_drawable),
                                 &off_x, &off_y);
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 42ca853..8bdf500 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -919,7 +919,7 @@ image_pick_color_invoker (GimpProcedure         *procedure,
       if (success)
         {
           if (sample_merged)
-            gimp_pickable_flush (GIMP_PICKABLE (gimp_image_get_projection (image)));
+            gimp_pickable_flush (GIMP_PICKABLE (image));
           else
             gimp_pickable_flush (GIMP_PICKABLE (drawable));
 
@@ -1796,7 +1796,7 @@ image_thumbnail_invoker (GimpProcedure         *procedure,
       else
         width  = MAX (1, (height * dwidth) / dheight);
 
-      gimp_pickable_flush (GIMP_PICKABLE (gimp_image_get_projection (image)));
+      gimp_pickable_flush (GIMP_PICKABLE (image));
 
       buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (image), context,
                                            width, height);
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index 4720961..31a083f 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -160,7 +160,7 @@ layer_new_from_visible_invoker (GimpProcedure         *procedure,
 
   if (success)
     {
-      GimpPickable *pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+      GimpPickable *pickable = GIMP_PICKABLE (image);
 
       gimp_pickable_flush (pickable);
 
diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c
index 8d6e764..7ccd586 100644
--- a/app/tools/gimpbycolorselecttool.c
+++ b/app/tools/gimpbycolorselecttool.c
@@ -120,7 +120,7 @@ gimp_by_color_select_tool_get_mask (GimpRegionSelectTool *region_select,
     }
   else
     {
-      pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+      pickable = GIMP_PICKABLE (image);
     }
 
   gimp_pickable_flush (pickable);
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index c42c2b8..9135dc2 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -1681,7 +1681,7 @@ gradmap_tile_validate (TileManager *tm,
   dw = tile_ewidth (tile);
   dh = tile_eheight (tile);
 
-  pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+  pickable = GIMP_PICKABLE (image);
 
   gimp_pickable_flush (pickable);
 
diff --git a/app/tools/gimprectangletool.c b/app/tools/gimprectangletool.c
index 6f7df65..3971fd3 100644
--- a/app/tools/gimprectangletool.c
+++ b/app/tools/gimprectangletool.c
@@ -2524,7 +2524,7 @@ gimp_rectangle_tool_auto_shrink (GimpRectangleTool *rect_tool)
 
   if (shrink_merged)
     {
-      pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+      pickable = GIMP_PICKABLE (image);
 
       x1 = private->x1;
       y1 = private->y1;
diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb
index 657b8fe..f75fd94 100644
--- a/tools/pdbgen/pdb/image.pdb
+++ b/tools/pdbgen/pdb/image.pdb
@@ -709,7 +709,7 @@ HELP
   if (success)
     {
       if (sample_merged)
-        gimp_pickable_flush (GIMP_PICKABLE (gimp_image_get_projection (image)));
+        gimp_pickable_flush (GIMP_PICKABLE (image));
       else
         gimp_pickable_flush (GIMP_PICKABLE (drawable));
 
@@ -2943,7 +2943,7 @@ HELP
   else
     width  = MAX (1, (height * dwidth) / dheight);
 
-  gimp_pickable_flush (GIMP_PICKABLE (gimp_image_get_projection (image)));
+  gimp_pickable_flush (GIMP_PICKABLE (image));
 
   buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (image), context,
                                        width, height);
diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb
index 5fcde34..806ea10 100644
--- a/tools/pdbgen/pdb/layer.pdb
+++ b/tools/pdbgen/pdb/layer.pdb
@@ -139,7 +139,7 @@ HELP
     %invoke = (
        code => <<'CODE'
 {
-  GimpPickable *pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+  GimpPickable *pickable = GIMP_PICKABLE (image);
 
   gimp_pickable_flush (pickable);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]