From 3abcaa8f279ba9c8ad82f07815aa755b2bdedf41 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 19 May 2018 23:14:20 -0400 Subject: colorspace::Component: Fix undefined references without lcms colorspace::Component's constructors are unconditionally referenced but were defined only if either HAVE_LIBLCMS1 or HAVE_LIBLCMS2 is defined. --- src/ui/widget/color-icc-selector.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index 32f99747a..c6f5b799f 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -108,15 +108,6 @@ icSigCmyData #define SPACE_ID_CMYK 2 -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -static cmsUInt16Number *getScratch() -{ - // bytes per pixel * input channels * width - static cmsUInt16Number *scritch = static_cast(g_new(cmsUInt16Number, 4 * 1024)); - - return scritch; -} - colorspace::Component::Component() : name() , tip() @@ -131,6 +122,15 @@ colorspace::Component::Component(std::string const &name, std::string const &tip { } +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +static cmsUInt16Number *getScratch() +{ + // bytes per pixel * input channels * width + static cmsUInt16Number *scritch = static_cast(g_new(cmsUInt16Number, 4 * 1024)); + + return scritch; +} + std::vector colorspace::getColorSpaceInfo(uint32_t space) { static std::map > sets; -- cgit v1.2.3