diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-05-22 09:07:34 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-05-22 09:07:34 +0000 |
| commit | 3ddb0853b36f3349f187737b774530a0cadd00f3 (patch) | |
| tree | 5ed366e5985e91a6f8dcf67ebf4749571916fa96 /src/ui/widget | |
| parent | Print: Match document size against known paper sizes (diff) | |
| parent | colorspace::Component: Fix undefined references without lcms (diff) | |
| download | inkscape-3ddb0853b36f3349f187737b774530a0cadd00f3.tar.gz inkscape-3ddb0853b36f3349f187737b774530a0cadd00f3.zip | |
Merge branch 'fix-undefined-references-without-lcms' of gitlab.com:libiquity/inkscape
Diffstat (limited to 'src/ui/widget')
| -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; |