← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to krita/image/brushengine/kis_paintop.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/brushengine/kis_paintop.cc
50
50
 
51
51
struct KisPaintOp::Private {
52
52
    Private()
53
 
            : dab(0) {
 
53
            : dab(0),currentScale(1.0),currentRotation(0) {
54
54
    }
55
55
 
56
56
    KisFixedPaintDeviceSP dab;
57
57
    KoColor color;
58
58
    KoColor previousPaintColor;
59
59
    KisPainter* painter;
 
60
    qreal currentScale;
 
61
    qreal currentRotation;
60
62
};
61
63
 
62
64
 
84
86
    return d->dab;
85
87
}
86
88
 
87
 
void KisPaintOp::splitCoordinate(qreal coordinate, qint32 *whole, qreal *fraction) const
 
89
void KisPaintOp::splitCoordinate(double coordinate, qint32 *whole, double *fraction)
88
90
{
89
91
    qint32 i = static_cast<qint32>(coordinate);
90
92
 
213
215
 
214
216
    return scale;
215
217
}
 
218
 
 
219
qreal KisPaintOp::currentRotation() const
 
220
{
 
221
    return d->currentRotation;
 
222
}
 
223
 
 
224
qreal KisPaintOp::currentScale() const
 
225
{
 
226
    return d->currentScale;
 
227
}
 
228
 
 
229
void KisPaintOp::setCurrentRotation(qreal rotation)
 
230
{
 
231
    d->currentRotation = rotation;
 
232
}
 
233
 
 
234
void KisPaintOp::setCurrentScale(qreal scale)
 
235
{
 
236
    d->currentScale = scale;
 
237
}