diff options
| author | Richard Hughes <richard@hughsie.com> | 2013-05-15 10:55:56 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2013-05-15 10:55:58 +0100 |
| commit | 561dfd01059112539d1afcedc1de64595472ee43 (patch) | |
| tree | a4ba5545986c8e5c3d8b270550403a9f9a9e7697 | |
| parent | dcd4be5be6d68b5b40a15a9c216c99385faee9c4 (diff) | |
| download | colord-561dfd01059112539d1afcedc1de64595472ee43.tar.gz | |
Bump the lcms2 dep to 2.4
2.4 was released in September 2012 which is more than enough time for the
distros to pick it up.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | lib/colord/cd-icc.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4114b6b..bd1f424 100644 --- a/configure.ac +++ b/configure.ac @@ -148,15 +148,11 @@ if test x$enable_gusb != xno; then fi AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes) -PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2) +PKG_CHECK_MODULES(LCMS, lcms2 >= 2.4) AC_CHECK_LIB(lcms2, cmsGetHeaderCreator, have_lcms_creator=yes) if test x$have_lcms_creator != x; then AC_DEFINE(HAVE_LCMS_GET_HEADER_CREATOR,1,[cmsGetHeaderCreator is available]) fi -AC_CHECK_LIB(lcms2, cmsGetToneCurveEstimatedTableEntries, have_lcms_table_entries=yes) -if test x$have_lcms_table_entries != x; then - AC_DEFINE(HAVE_LCMS_GET_TABLE_ENTRIES,1,[cmsGetToneCurveEstimatedTableEntries is available]) -fi AC_CHECK_LIB(lcms2, cmsMLUtranslationsCount, have_lcms_mlu_translations_count=yes) if test x$have_lcms_mlu_translations_count != x; then AC_DEFINE(HAVE_LCMS_MLU_TRANSLATIONS_COUNT,1,[cmsMLUtranslationsCount is available]) diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c index e949834..35e1bc0 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c @@ -467,10 +467,8 @@ cd_icc_to_string (CdIcc *icc) continue; } g_string_append_printf (str, " channels\t = %i\n", 3); -#ifdef HAVE_LCMS_GET_TABLE_ENTRIES g_string_append_printf (str, " entries\t = %i\n", cmsGetToneCurveEstimatedTableEntries (vcgt[0])); -#endif break; } case cmsSigNamedColor2Type: |