diff options
| author | Stefano Karapetsas <[email protected]> | 2013-09-26 10:24:01 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-09-26 10:24:01 +0200 |
| commit | 94214db85381f246290cfebb61de02aea2a441b3 (patch) | |
| tree | 8f6871f7bfc8fcc2f5bf0334c37e6982ba24c3aa /src/eom-window.c | |
| parent | 144066a7196fb19e1cb976d7ff7bdee353818fd5 (diff) | |
| download | eom-94214db85381f246290cfebb61de02aea2a441b3.tar.bz2 eom-94214db85381f246290cfebb61de02aea2a441b3.tar.xz | |
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
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 11 |
1 files changed, 1 insertions, 10 deletions
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, " |