← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to krita/image/kis_paint_layer.cc

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/image/kis_paint_layer.cc
45
45
        : KisLayer(image, name, opacity)
46
46
        , m_d(new Private())
47
47
{
48
 
    Q_ASSERT(image);
 
48
 
49
49
    Q_ASSERT(dev);
50
50
    m_d->alphaLocked = false;
51
51
    m_d->paintDevice = dev;
52
52
    m_d->paintDevice->setParentNode(this);
53
 
    m_d->paintDevice->setDefaultBounds(KisDefaultBounds(image));
 
53
 
 
54
    // fixme: overwriting the default bounds is unexpected behaviour.
 
55
    // maybe something like if(dynamic_cast<KisDefaultBounds*>(dev.defaultBounds())) {..} is better.
 
56
    m_d->paintDevice->setDefaultBounds(new KisDefaultBounds(image));
54
57
}
55
58
 
56
59
 
59
62
        , m_d(new Private())
60
63
{
61
64
    Q_ASSERT(image);
62
 
    m_d->paintDevice = new KisPaintDevice(this, image->colorSpace(), KisDefaultBounds(image));
 
65
    m_d->paintDevice = new KisPaintDevice(this, image->colorSpace(), new KisDefaultBounds(image));
63
66
    m_d->alphaLocked = false;
64
67
}
65
68
 
72
75
        colorSpace = image->colorSpace();
73
76
    }
74
77
    Q_ASSERT(colorSpace);
75
 
    m_d->paintDevice = new KisPaintDevice(this, colorSpace, KisDefaultBounds(image));
 
78
    m_d->paintDevice = new KisPaintDevice(this, colorSpace, new KisDefaultBounds(image));
76
79
    m_d->alphaLocked = false;
77
80
}
78
81
 
115
118
        KisPaintDeviceSP projection,
116
119
        const QRect& rect) const
117
120
{
 
121
    lockTemporaryTarget();
 
122
 
118
123
    KisPainter gc(projection);
119
124
    gc.setCompositeOp(projection->colorSpace()->compositeOp(COMPOSITE_COPY));
120
125
    gc.bitBlt(rect.topLeft(), original, rect);
127
132
        }
128
133
        gc.bitBlt(rect.topLeft(), temporaryTarget(), rect);
129
134
    }
 
135
 
 
136
    unlockTemporaryTarget();
130
137
}
131
138
 
132
139
QIcon KisPaintLayer::icon() const
136
143
 
137
144
void KisPaintLayer::setImage(KisImageWSP image)
138
145
{
139
 
    m_d->paintDevice->setDefaultBounds(KisDefaultBounds(image));
 
146
    m_d->paintDevice->setDefaultBounds(new KisDefaultBounds(image));
140
147
    KisLayer::setImage(image);
141
148
}
142
149