[gimp] configure.ac, plug-ins: require lcms >= 2.6 and remove #ifdef from lcms.c

[Michael Natterer <mitch src gnome org>]

commit a0398e5028559c146b79228a6e75db7c14e7ef41
Author: Michael Natterer <mitch gimp org>
Date:   Sat Feb 21 00:32:18 2015 +0100

    configure.ac, plug-ins: require lcms >= 2.6 and remove #ifdef from lcms.c

 configure.ac           |    2 +-
 plug-ins/common/lcms.c |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d9334a..8c0099a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ m4_define([poppler_required_version], [0.12.4])
 m4_define([poppler_data_required_version], [0.4.7])
 m4_define([libgudev_required_version], [167])
 m4_define([gexiv2_required_version], [0.6.1])
-m4_define([lcms_required_version], [2.2])
+m4_define([lcms_required_version], [2.6])
 m4_define([libpng_required_version], [1.2.37])
 m4_define([liblzma_required_version], [5.0.0])
 m4_define([openexr_required_version], [1.6.1])
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 95f7346..40d115e 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -948,8 +948,6 @@ lcms_layers_transform_rgb (gint                     *layers,
         }
       else if (type == babl_type ("half")) /* 16-bit floating point (half) */
         {
-#ifdef TYPE_RGB_HALF_FLT
-          /* half float types are only in lcms 2.4 and newer */
           if (has_alpha)
             {
               lcms_format = TYPE_RGBA_HALF_FLT;
@@ -960,7 +958,6 @@ lcms_layers_transform_rgb (gint                     *layers,
               lcms_format = TYPE_RGB_HALF_FLT;
               iter_format = babl_format ("R'G'B' float");
             }
-#endif /* TYPE_RGB_HALF_FLT */
         }
       else if (type == babl_type ("float"))
         {