dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Michael Natterer 2015-02-21 00:32:18 +01:00
parent 29456b96f9
commit a0398e5028
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -66,7 +66,7 @@ m4_define([poppler_required_version], [0.12.4])
m4_define([poppler_data_required_version], [0.4.7]) m4_define([poppler_data_required_version], [0.4.7])
m4_define([libgudev_required_version], [167]) m4_define([libgudev_required_version], [167])
m4_define([gexiv2_required_version], [0.6.1]) 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([libpng_required_version], [1.2.37])
m4_define([liblzma_required_version], [5.0.0]) m4_define([liblzma_required_version], [5.0.0])
m4_define([openexr_required_version], [1.6.1]) m4_define([openexr_required_version], [1.6.1])

3
plug-ins/common/lcms.c
View File

@ -948,8 +948,6 @@ lcms_layers_transform_rgb (gint *layers,
} }
else if (type == babl_type ("half")) /* 16-bit floating point (half) */ 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) if (has_alpha)
{ {
lcms_format = TYPE_RGBA_HALF_FLT; lcms_format = TYPE_RGBA_HALF_FLT;
@ -960,7 +958,6 @@ lcms_layers_transform_rgb (gint *layers,
lcms_format = TYPE_RGB_HALF_FLT; lcms_format = TYPE_RGB_HALF_FLT;
iter_format = babl_format ("R'G'B' float"); iter_format = babl_format ("R'G'B' float");
} }
#endif /* TYPE_RGB_HALF_FLT */
} }
else if (type == babl_type ("float")) else if (type == babl_type ("float"))
{ {