← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/pigment/colorspaces/KoAlphaColorSpace.h

  • 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:
libs/pigment/colorspaces/KoAlphaColorSpace.h
95
95
        return m_profile;
96
96
    }
97
97
 
98
 
    virtual KoColorProfile* profile() {
99
 
        return m_profile;
100
 
    }
101
 
 
102
98
    virtual QImage convertToQImage(const quint8 *data, qint32 width, qint32 height,
103
 
                                   const KoColorProfile *  dstProfile, KoColorConversionTransformation::Intent renderingIntent) const;
 
99
                                   const KoColorProfile *  dstProfile,
 
100
                                   KoColorConversionTransformation::Intent renderingIntent,
 
101
                                   KoColorConversionTransformation::ConversionFlags conversionFlags) const;
104
102
 
105
103
    virtual void toLabA16(const quint8* src, quint8* dst, quint32 nPixels) const {
106
104
        quint16* lab = reinterpret_cast<quint16*>(dst);
173
171
    virtual bool convertPixelsTo(const quint8 *src,
174
172
                                 quint8 *dst, const KoColorSpace * dstColorSpace,
175
173
                                 quint32 numPixels,
176
 
                                 KoColorConversionTransformation::Intent  renderingIntent = KoColorConversionTransformation::IntentPerceptual) const;
 
174
                                 KoColorConversionTransformation::Intent  renderingIntent,
 
175
                                 KoColorConversionTransformation::ConversionFlags conversionFlags) const;
177
176
private:
178
177
    KoColorProfile* m_profile;
179
178
    QList<KoCompositeOp*> m_compositeOps;