[gimp/metadata-browser] app: forgot the GimpImageType -> Babl change in pick_color() here



commit 78589eaf57eb3107d1ab9d4283df2f78348396d6
Author: Michael Natterer <mitch gimp org>
Date:   Thu Mar 29 02:33:48 2012 +0200

    app: forgot the GimpImageType -> Babl change in pick_color() here

 app/tools/gimpimagemaptool.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index 3087096..9f39a1d 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -96,7 +96,7 @@ static void      gimp_image_map_tool_options_notify (GimpTool         *tool,
 static gboolean  gimp_image_map_tool_pick_color     (GimpColorTool    *color_tool,
                                                      gint              x,
                                                      gint              y,
-                                                     GimpImageType    *sample_type,
+                                                     const Babl      **sample_format,
                                                      GimpRGB          *color,
                                                      gint             *color_index);
 static void      gimp_image_map_tool_map            (GimpImageMapTool *im_tool);
@@ -508,19 +508,19 @@ gimp_image_map_tool_options_notify (GimpTool         *tool,
 }
 
 static gboolean
-gimp_image_map_tool_pick_color (GimpColorTool *color_tool,
-                                gint           x,
-                                gint           y,
-                                GimpImageType *sample_type,
-                                GimpRGB       *color,
-                                gint          *color_index)
+gimp_image_map_tool_pick_color (GimpColorTool  *color_tool,
+                                gint            x,
+                                gint            y,
+                                const Babl    **sample_format,
+                                GimpRGB        *color,
+                                gint           *color_index)
 {
   GimpImageMapTool *tool = GIMP_IMAGE_MAP_TOOL (color_tool);
   gint              off_x, off_y;
 
   gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
 
-  *sample_type = gimp_drawable_type (tool->drawable);
+  *sample_format = gimp_drawable_get_format (tool->drawable);
 
   return gimp_pickable_pick_color (GIMP_PICKABLE (tool->image_map),
                                    x - off_x,



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