diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-05-20 03:14:20 +0000 |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-05-20 20:05:29 +0000 |
| commit | 3abcaa8f279ba9c8ad82f07815aa755b2bdedf41 (patch) | |
| tree | 4eaca3ab5cfb67a1c9f34fc2717a0c98a3e0cfb3 /src | |
| parent | DocumentProperties: Fix undefined references without lcms (diff) | |
| download | inkscape-3abcaa8f279ba9c8ad82f07815aa755b2bdedf41.tar.gz inkscape-3abcaa8f279ba9c8ad82f07815aa755b2bdedf41.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/color-icc-selector.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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<cmsUInt16Number *>(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<cmsUInt16Number *>(g_new(cmsUInt16Number, 4 * 1024)); + + return scritch; +} + std::vector<colorspace::Component> colorspace::getColorSpaceInfo(uint32_t space) { static std::map<cmsUInt32Number, std::vector<Component> > sets; |