gimp r24693 - in trunk: . app/gegl app/tools

[mitch svn gnome org]

Author: mitch
Date: Wed Jan 23 16:51:33 2008
New Revision: 24693
URL: http://svn.gnome.org/viewvc/gimp?rev=24693&view=rev

Log:
2008-01-23  Michael Natterer  <mitch gimp org>

	* app/gegl/gimphuesaturationconfig.[ch]
	(gimp_hue_saturation_config_to_cruft): call
	hue_saturation_calculate_transfers() here...

	* app/tools/gimphuesaturationtool.c (gimp_hue_saturation_tool_map):
	...instead of here.



Modified:
   trunk/ChangeLog
   trunk/app/gegl/gimphuesaturationconfig.c
   trunk/app/gegl/gimphuesaturationconfig.h
   trunk/app/tools/gimphuesaturationtool.c

Modified: trunk/app/gegl/gimphuesaturationconfig.c
==============================================================================
--- trunk/app/gegl/gimphuesaturationconfig.c	(original)
+++ trunk/app/gegl/gimphuesaturationconfig.c	Wed Jan 23 16:51:33 2008
@@ -222,19 +222,21 @@
 
 void
 gimp_hue_saturation_config_to_cruft (GimpHueSaturationConfig *config,
-                                     HueSaturation           *hs)
+                                     HueSaturation           *cruft)
 {
   GimpHueRange range;
 
   g_return_if_fail (GIMP_IS_HUE_SATURATION_CONFIG (config));
-  g_return_if_fail (hs != NULL);
+  g_return_if_fail (cruft != NULL);
 
   for (range = GIMP_ALL_HUES; range <= GIMP_MAGENTA_HUES; range++)
     {
-      hs->hue[range]        = config->hue[range]        * 180;
-      hs->saturation[range] = config->saturation[range] * 100;
-      hs->lightness[range]  = config->lightness[range]  * 100;
+      cruft->hue[range]        = config->hue[range]        * 180;
+      cruft->saturation[range] = config->saturation[range] * 100;
+      cruft->lightness[range]  = config->lightness[range]  * 100;
     }
 
-  hs->overlap = config->overlap * 100;
+  cruft->overlap = config->overlap * 100;
+
+  hue_saturation_calculate_transfers (cruft);
 }

Modified: trunk/app/gegl/gimphuesaturationconfig.h
==============================================================================
--- trunk/app/gegl/gimphuesaturationconfig.h	(original)
+++ trunk/app/gegl/gimphuesaturationconfig.h	Wed Jan 23 16:51:33 2008
@@ -60,7 +60,7 @@
 
 /*  temp cruft  */
 void    gimp_hue_saturation_config_to_cruft    (GimpHueSaturationConfig *config,
-                                                HueSaturation           *hs);
+                                                HueSaturation           *cruft);
 
 
 #endif /* __GIMP_HUE_SATURATION_CONFIG_H__ */

Modified: trunk/app/tools/gimphuesaturationtool.c
==============================================================================
--- trunk/app/tools/gimphuesaturationtool.c	(original)
+++ trunk/app/tools/gimphuesaturationtool.c	Wed Jan 23 16:51:33 2008
@@ -210,8 +210,6 @@
   GimpHueSaturationTool *hs_tool = GIMP_HUE_SATURATION_TOOL (image_map_tool);
 
   gimp_hue_saturation_config_to_cruft (hs_tool->config, hs_tool->hue_saturation);
-
-  hue_saturation_calculate_transfers (hs_tool->hue_saturation);
 }