← 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_group_layer.cc

  • 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_group_layer.cc
20
20
 
21
21
#include "kis_group_layer.h"
22
22
 
 
23
#include <KoIcon.h>
23
24
#include <KoCompositeOp.h>
24
25
#include <KoColorSpace.h>
25
26
 
123
124
 
124
125
QIcon KisGroupLayer::icon() const
125
126
{
126
 
    return KIcon("folder");
 
127
    return koIcon("folder");
127
128
}
128
129
 
129
130
void KisGroupLayer::setImage(KisImageWSP image)
151
152
        dev->setX(m_d->x);
152
153
        dev->setY(m_d->y);
153
154
        quint8* defaultPixel = colorSpace->allocPixelBuffer(1);
154
 
        colorSpace->convertPixelsTo(m_d->paintDevice->defaultPixel(), defaultPixel, colorSpace, 1);
 
155
        colorSpace->convertPixelsTo(m_d->paintDevice->defaultPixel(), defaultPixel, colorSpace, 1, KoColorConversionTransformation::IntentPerceptual, KoColorConversionTransformation::BlackpointCompensation);
155
156
        dev->setDefaultPixel(defaultPixel);
156
157
        delete[] defaultPixel;
157
158
        m_d->paintDevice = dev;
164
165
KisLayer* KisGroupLayer::onlyMeaningfulChild() const
165
166
{
166
167
    KisNode *child = firstChild().data();
167
 
 
168
168
    KisLayer *onlyLayer = 0;
169
169
 
170
 
    while(child) {
 
170
    while (child) {
171
171
        KisLayer *layer = dynamic_cast<KisLayer*>(child);
172
 
        if(layer) {
173
 
            if(onlyLayer) return 0;
 
172
        if (layer) {
 
173
            if (onlyLayer) return 0;
174
174
            onlyLayer = layer;
175
175
        }
176
 
 
177
176
        child = child->nextSibling().data();
178
177
    }
179
178