← Back to branch summary

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

« back to all changes in this revision

Viewing changes to krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
16
16
 *  along with this program; if not, write to the Free Software
17
17
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18
18
 */
19
 
 
20
19
#include "kis_imagepipe_brush.h"
21
20
#include "kis_imagepipe_brush_p.h"
22
21
 
69
68
        m_d->brushes.append(new KisGbrBrush(devices.at(0).at(i), 0, 0, w, h));
70
69
    }
71
70
 
72
 
    setImage(m_d->brushes.at(0)->img());
 
71
    setImage(m_d->brushes.at(0)->image());
73
72
 
74
73
    m_d->brushType = PIPE_IMAGE;
75
74
}
213
212
    return true;
214
213
}
215
214
 
216
 
QImage KisImagePipeBrush::img() const
 
215
QImage KisImagePipeBrush::image() const
217
216
{
218
217
    if (m_d->brushes.isEmpty()) {
219
218
        return QImage();
220
219
    } else {
221
 
        return m_d->brushes.at(0)->img();
 
220
        return m_d->brushes.at(0)->image();
222
221
    }
223
222
}
224
223
 
225
224
 
226
225
void KisImagePipeBrush::generateMaskAndApplyMaskOrCreateDab(KisFixedPaintDeviceSP dst, KisBrush::ColoringInformation* coloringInformation, double scaleX, double scaleY, double angle, const KisPaintInformation& info, double subPixelX , double subPixelY) const
227
226
{
228
 
    Q_UNUSED(scaleX);
229
 
    Q_UNUSED(scaleY);
230
 
    Q_UNUSED(angle);
231
227
    if (m_d->brushes.isEmpty()) return;
232
228
    selectNextBrush(info);
233
 
    m_d->brushes.at(m_d->currentBrush)->generateMaskAndApplyMaskOrCreateDab(dst, coloringInformation, 1.0, 1.0, 0.0, info, subPixelX, subPixelY);
 
229
    m_d->brushes.at(m_d->currentBrush)->generateMaskAndApplyMaskOrCreateDab(dst, coloringInformation, scaleX, scaleY, angle, info, subPixelX, subPixelY);
234
230
}
235
231
 
236
 
KisFixedPaintDeviceSP KisImagePipeBrush::image(const KoColorSpace * colorSpace, double scale, double angle, const KisPaintInformation& info, double subPixelX, double subPixelY) const
 
232
KisFixedPaintDeviceSP KisImagePipeBrush::paintDevice(const KoColorSpace * colorSpace, double scale, double angle, const KisPaintInformation& info, double subPixelX, double subPixelY) const
237
233
{
238
234
    Q_UNUSED(scale);
239
235
    Q_UNUSED(angle);
240
236
    if (m_d->brushes.isEmpty()) return KisFixedPaintDeviceSP(0);
241
237
    selectNextBrush(info);
242
 
    return m_d->brushes.at(m_d->currentBrush)->image(colorSpace, 1.0, 0.0, info, subPixelX, subPixelY);
 
238
    return m_d->brushes.at(m_d->currentBrush)->paintDevice(colorSpace, scale, angle, info, subPixelX, subPixelY);
243
239
}
244
240
 
245
241
void KisImagePipeBrush::setParasiteString(const QString& parasite)