From 94214db85381f246290cfebb61de02aea2a441b3 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Thu, 26 Sep 2013 10:24:01 +0200
Subject: Migration to lcms2

Closes #25
https://github.com/mate-desktop/mate-image-viewer/issues/25
See https://git.gnome.org/browse/eog/commit/?id=3c3a835
---
 src/eom-window.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/eom-window.c')

diff --git a/src/eom-window.c b/src/eom-window.c
index 1c67eff..3ba7259 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -72,7 +72,7 @@
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
-#include <lcms.h>
+#include <lcms2.h>
 #endif
 
 #define EOM_WINDOW_GET_PRIVATE(object) \
@@ -652,17 +652,8 @@ eom_window_get_display_profile (GdkScreen *screen)
 				return NULL;
 		}
 
-		/* Make lcms errors non-fatal here, as it is possible
-		 * to load invalid profiles with XICC.
-		 * We don't want lcms to abort EOM in that case.
-		 */
-		lcms_error_action = cmsErrorAction (LCMS_ERROR_IGNORE);
-
 		profile = cmsOpenProfileFromMem (str, length);
 
-		// Restore the previous error setting
-		cmsErrorAction (lcms_error_action);
-
 		if (G_UNLIKELY (profile == NULL)) {
 			eom_debug_message (DEBUG_LCMS,
 					   "Invalid display profile, "
-- 
cgit v1.2.1