diff options
| author | Trond Kjernaasen <trond@trolltech.com> | 2009-03-30 13:08:21 +0200 |
|---|---|---|
| committer | Trond Kjernaasen <trond@trolltech.com> | 2009-03-30 13:12:32 +0200 |
| commit | 2bc824dde1033ae01f618a3ff534ba26d7a628af (patch) | |
| tree | bce28b773ad457ec6325d59919a170e185f3cc45 /src/gui/image/qpaintengine_pic.cpp | |
| parent | dcdafbcb132341bb22b6159f0f1dea1ef00f7c18 (diff) | |
Fix draImage() calls for threaded printing to a PostScript printer.
QPicture didn't have an implementation for drawImage(). All images were
converted to QPixmaps before they were drawn.
Task-number: 249322
Reviewed-by: Gunnar Sletta
Diffstat (limited to 'src/gui/image/qpaintengine_pic.cpp')
| -rw-r--r-- | src/gui/image/qpaintengine_pic.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp index cba98276ce..a130a1a00c 100644 --- a/src/gui/image/qpaintengine_pic.cpp +++ b/src/gui/image/qpaintengine_pic.cpp @@ -346,7 +346,7 @@ void QPicturePaintEngine::writeCmdLength(int pos, const QRectF &r, bool corr) if (corr) { // widen bounding rect int w2 = painter()->pen().width() / 2; br.setCoords(br.left() - w2, br.top() - w2, - br.right() + w2, br.bottom() + w2); + br.right() + w2, br.bottom() + w2); } br = painter()->transform().mapRect(br); if (painter()->hasClipping()) { @@ -458,6 +458,25 @@ void QPicturePaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap writeCmdLength(pos, r, false); } +void QPicturePaintEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr, + Qt::ImageConversionFlags flags) +{ + Q_D(QPicturePaintEngine); +#ifdef QT_PICTURE_DEBUG + qDebug() << " -> drawImage():" << r << sr; +#endif + int pos; + SERIALIZE_CMD(QPicturePrivate::PdcDrawImage); + if (d->pic_d->in_memory_only) { + int index = d->pic_d->image_list.size(); + d->pic_d->image_list.append(image); + d->s << r << index << sr << (quint32) flags; + } else { + d->s << r << image << sr << (quint32) flags; + } + writeCmdLength(pos, r, false); +} + extern int qt_defaultDpi(); void QPicturePaintEngine::drawTextItem(const QPointF &p , const QTextItem &ti) |