← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plugins/colorengines/lcms2/LcmsEnginePlugin.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/colorengines/lcms2/LcmsEnginePlugin.cpp
51
51
 
52
52
#include "colorspaces/lab_u8/LabU8ColorSpace.h"
53
53
#include "colorspaces/lab_u16/LabColorSpace.h"
 
54
 
54
55
#include "colorspaces/lab_f32/LabF32ColorSpace.h"
55
56
 
56
57
#include "colorspaces/xyz_u8/XyzU8ColorSpace.h"
59
60
 
60
61
#include "colorspaces/rgb_u8/RgbU8ColorSpace.h"
61
62
#include "colorspaces/rgb_u16/RgbU16ColorSpace.h"
 
63
#ifdef HAVE_LCMS24
 
64
#include "colorspaces/rgb_f16/RgbF16ColorSpace.h"
 
65
#endif
62
66
#include "colorspaces/rgb_f32/RgbF32ColorSpace.h"
63
67
 
64
68
#include "colorspaces/ycbcr_u8/YCbCrU8ColorSpace.h"
145
149
 
146
150
    registry->add(new RgbU8ColorSpaceFactory());
147
151
    registry->add(new RgbU16ColorSpaceFactory());
 
152
#ifdef HAVE_LCMS24
 
153
    registry->add(new RgbF16ColorSpaceFactory());
 
154
#endif
148
155
    registry->add(new RgbF32ColorSpaceFactory());
149
156
 
150
157
 
156
163
                new KoBasicHistogramProducerFactory<KoBasicU16HistogramProducer>
157
164
                (KoID("RGBU16HISTO", i18n("RGB16 Histogram")), RGBAColorModelID.id(), Integer16BitsColorDepthID.id()));
158
165
 
 
166
#ifdef HAVE_LCMS24
 
167
    KoHistogramProducerFactoryRegistry::instance()->add(
 
168
                new KoBasicHistogramProducerFactory<KoBasicF16HalfHistogramProducer>
 
169
                (KoID("RGBF16HISTO", i18n("RGBF16 Histogram")), RGBAColorModelID.id(), Integer16BitsColorDepthID.id()));
 
170
#endif
 
171
 
159
172
    KoHistogramProducerFactoryRegistry::instance()->add(
160
173
                new KoBasicHistogramProducerFactory<KoBasicF32HistogramProducer>
161
174
                (KoID("RGF328HISTO", i18n("RGBF32 Histogram")), RGBAColorModelID.id(), Float32BitsColorDepthID.id()));