|
 |
d6dc5cd |
diff -Nurb --strip-trailing-cr geeqie-1.1-orig/configure.in geeqie-1.1/configure.in
|
|
|
d6dc5cd |
--- geeqie-1.1-orig/configure.in 2012-08-12 22:13:40.000000000 +0200
|
|
|
d6dc5cd |
+++ geeqie-1.1/configure.in 2013-12-09 18:34:25.367495538 +0100
|
|
|
d6dc5cd |
@@ -275,6 +275,13 @@
|
|
|
d6dc5cd |
[liblcms=$enableval], [liblcms=auto])
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
if test "x${liblcms}" != "xno"; then
|
|
|
d6dc5cd |
+ PKG_CHECK_MODULES(LCMS, [lcms2 >= 2.0],
|
|
|
d6dc5cd |
+ [
|
|
|
d6dc5cd |
+ HAVE_LCMS=yes
|
|
|
d6dc5cd |
+ AC_DEFINE(HAVE_LCMS2, 1, [lcms2 is used])
|
|
|
d6dc5cd |
+ AC_DEFINE(HAVE_LCMS, 1, [enable LCMS])
|
|
|
d6dc5cd |
+ ],
|
|
|
d6dc5cd |
+ [
|
|
|
d6dc5cd |
PKG_CHECK_MODULES(LCMS, [lcms >= 1.14],
|
|
|
d6dc5cd |
[
|
|
|
d6dc5cd |
HAVE_LCMS=yes
|
|
|
d6dc5cd |
@@ -284,6 +291,7 @@
|
|
|
d6dc5cd |
HAVE_LCMS=no
|
|
|
d6dc5cd |
AC_MSG_WARN([$LCMS_PKG_ERRORS])
|
|
|
d6dc5cd |
])
|
|
|
d6dc5cd |
+ ])
|
|
|
d6dc5cd |
else
|
|
|
d6dc5cd |
HAVE_LCMS=disabled
|
|
|
d6dc5cd |
fi
|
|
|
d6dc5cd |
diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/color-man.c geeqie-1.1/src/color-man.c
|
|
|
d6dc5cd |
--- geeqie-1.1-orig/src/color-man.c 2012-08-12 22:13:41.000000000 +0200
|
|
|
d6dc5cd |
+++ geeqie-1.1/src/color-man.c 2013-12-09 18:34:07.441461661 +0100
|
|
|
d6dc5cd |
@@ -21,7 +21,11 @@
|
|
|
d6dc5cd |
#ifdef HAVE_LCMS
|
|
|
d6dc5cd |
/*** color support enabled ***/
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
+#ifdef HAVE_LCMS2
|
|
|
d6dc5cd |
+#include <lcms2.h>
|
|
|
d6dc5cd |
+#else
|
|
|
d6dc5cd |
#include <lcms.h>
|
|
|
d6dc5cd |
+#endif
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
typedef struct _ColorManCache ColorManCache;
|
|
|
d6dc5cd |
@@ -52,7 +56,9 @@
|
|
|
d6dc5cd |
if (init_done) return;
|
|
|
d6dc5cd |
init_done = TRUE;
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
+#ifndef HAVE_LCMS2
|
|
|
d6dc5cd |
cmsErrorAction(LCMS_ERROR_IGNORE);
|
|
|
d6dc5cd |
+#endif
|
|
|
d6dc5cd |
}
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
static cmsHPROFILE color_man_create_adobe_comp(void)
|
|
|
d6dc5cd |
@@ -425,7 +431,14 @@
|
|
|
d6dc5cd |
case COLOR_PROFILE_FILE:
|
|
|
d6dc5cd |
if (profile)
|
|
|
d6dc5cd |
{
|
|
|
d6dc5cd |
+#ifdef HAVE_LCMS2
|
|
|
d6dc5cd |
+ cmsUInt8Number profileID[17];
|
|
|
d6dc5cd |
+ profileID[16] = '\0';
|
|
|
d6dc5cd |
+ cmsGetHeaderProfileID(profile, profileID);
|
|
|
d6dc5cd |
+ return g_strdup(profileID);
|
|
|
d6dc5cd |
+#else
|
|
|
d6dc5cd |
return g_strdup(cmsTakeProductName(profile));
|
|
|
d6dc5cd |
+#endif
|
|
|
d6dc5cd |
}
|
|
|
d6dc5cd |
return g_strdup(_("Custom profile"));
|
|
|
d6dc5cd |
break;
|
|
|
d6dc5cd |
diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/exif-common.c geeqie-1.1/src/exif-common.c
|
|
|
d6dc5cd |
--- geeqie-1.1-orig/src/exif-common.c 2012-08-12 22:13:41.000000000 +0200
|
|
|
d6dc5cd |
+++ geeqie-1.1/src/exif-common.c 2013-12-09 18:34:07.442461606 +0100
|
|
|
d6dc5cd |
@@ -23,10 +23,10 @@
|
|
|
d6dc5cd |
#ifdef HAVE_LCMS
|
|
|
d6dc5cd |
/*** color support enabled ***/
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
-#ifdef HAVE_LCMS_LCMS_H
|
|
|
d6dc5cd |
- #include <lcms/lcms.h>
|
|
|
d6dc5cd |
+#ifdef HAVE_LCMS2
|
|
|
d6dc5cd |
+#include <lcms2.h>
|
|
|
d6dc5cd |
#else
|
|
|
d6dc5cd |
- #include <lcms.h>
|
|
|
d6dc5cd |
+#include <lcms.h>
|
|
|
d6dc5cd |
#endif
|
|
|
d6dc5cd |
#endif
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
@@ -413,6 +413,9 @@
|
|
|
d6dc5cd |
|
|
|
d6dc5cd |
static gchar *exif_build_formatted_ColorProfile(ExifData *exif)
|
|
|
d6dc5cd |
{
|
|
|
d6dc5cd |
+#ifdef HAVE_LCMS2
|
|
|
d6dc5cd |
+ cmsUInt8Number profileID[17];
|
|
|
d6dc5cd |
+#endif
|
|
|
d6dc5cd |
const gchar *name = "";
|
|
|
d6dc5cd |
const gchar *source = "";
|
|
|
d6dc5cd |
guchar *profile_data;
|
|
|
d6dc5cd |
@@ -452,7 +455,13 @@
|
|
|
d6dc5cd |
profile = cmsOpenProfileFromMem(profile_data, profile_len);
|
|
|
d6dc5cd |
if (profile)
|
|
|
d6dc5cd |
{
|
|
|
d6dc5cd |
+#ifdef HAVE_LCMS2
|
|
|
d6dc5cd |
+ profileID[16] = '\0';
|
|
|
d6dc5cd |
+ cmsGetHeaderProfileID(profile, profileID);
|
|
|
d6dc5cd |
+ name = profileID;
|
|
|
d6dc5cd |
+#else
|
|
|
d6dc5cd |
name = cmsTakeProductName(profile);
|
|
|
d6dc5cd |
+#endif
|
|
|
d6dc5cd |
cmsCloseProfile(profile);
|
|
|
d6dc5cd |
}
|
|
|
d6dc5cd |
g_free(profile_data);
|