gimp r24581 - in branches/gimp-2-4: . modules

[neo svn gnome org]

Author: neo
Date: Wed Jan  9 20:33:16 2008
New Revision: 24581
URL: http://svn.gnome.org/viewvc/gimp?rev=24581&view=rev

Log:
2008-01-09  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* modules/colorsel_cmyk_lcms.c (colorsel_cmyk_class_init): don't
	abort on errors in lcms.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/modules/colorsel_cmyk_lcms.c

Modified: branches/gimp-2-4/modules/colorsel_cmyk_lcms.c
==============================================================================
--- branches/gimp-2-4/modules/colorsel_cmyk_lcms.c	(original)
+++ branches/gimp-2-4/modules/colorsel_cmyk_lcms.c	Wed Jan  9 20:33:16 2008
@@ -156,6 +156,8 @@
   selector_class->stock_id   = GTK_STOCK_PRINT;  /* FIXME */
   selector_class->set_color  = colorsel_cmyk_set_color;
   selector_class->set_config = colorsel_cmyk_set_config;
+
+  cmsErrorAction (LCMS_ERROR_IGNORE);
 }
 
 static void