← Back to branch summary

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

« back to all changes in this revision

Viewing changes to krita/image/kis_async_merger.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:
krita/image/kis_async_merger.cpp
325
325
    // because the channel flags from the source layer doesn't match with the colorspace of the projection device
326
326
    // this leads to the situation that the wrong channels will be enabled/disabled
327
327
    if(!channelFlags.isEmpty() && m_currentProjection->colorSpace() != device->colorSpace()) {
328
 
        KoColorSpace* src = device->colorSpace();
329
 
        KoColorSpace* dst = m_currentProjection->colorSpace();
 
328
        const KoColorSpace* src = device->colorSpace();
 
329
        const KoColorSpace* dst = m_currentProjection->colorSpace();
330
330
 
331
331
        bool alphaFlagIsSet        = (src->channelFlags(false,true) & channelFlags) == src->channelFlags(false,true);
332
332
        bool allColorFlagsAreSet   = (src->channelFlags(true,false) & channelFlags) == src->channelFlags(true,false);