diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-16 11:43:58 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-19 09:15:55 +0200 |
commit | e0972ba5edbd25ba8f0521da38c68cdb019b28a9 (patch) | |
tree | e569d749c3b3879f64dd53fd89a06d39cf4d33d5 /src/gui/painting/qpdf.cpp | |
parent | 2df117b8ad0b0726cd6d7a084a9dced4710617a7 (diff) |
PDF doesn't require the alpha paintengine
Remove the inheritance from the alpha paint engine
for the PDF generator. The alpha engine was only
required to support transparency on Postscript.
Change-Id: If09a00a3123f73e4c36f708651a3abae014187a3
Reviewed-on: http://codereview.qt.nokia.com/3204
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/painting/qpdf.cpp')
-rw-r--r-- | src/gui/painting/qpdf.cpp | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 5f496777af..dce3eec6fa 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -928,12 +928,12 @@ void QPdfPage::streamImage(int w, int h, int object) QPdfEngine::QPdfEngine(QPdfEnginePrivate &dd) - : QAlphaPaintEngine(dd, qt_pdf_decide_features()) + : QPaintEngine(dd, qt_pdf_decide_features()) { } QPdfEngine::QPdfEngine() - : QAlphaPaintEngine(*new QPdfEnginePrivate(), qt_pdf_decide_features()) + : QPaintEngine(*new QPdfEnginePrivate(), qt_pdf_decide_features()) { } @@ -985,11 +985,6 @@ void QPdfEngine::drawRects (const QRectF *rects, int rectCount) return; Q_D(QPdfEngine); - if (d->useAlphaEngine) { - QAlphaPaintEngine::drawRects(rects, rectCount); - if (!continueCall()) - return; - } if (d->clipEnabled && d->allClipped) return; @@ -1018,12 +1013,6 @@ void QPdfEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawM { Q_D(QPdfEngine); - if (d->useAlphaEngine) { - QAlphaPaintEngine::drawPolygon(points, pointCount, mode); - if (!continueCall()) - return; - } - if (!points || !pointCount) return; @@ -1060,12 +1049,6 @@ void QPdfEngine::drawPath (const QPainterPath &p) { Q_D(QPdfEngine); - if (d->useAlphaEngine) { - QAlphaPaintEngine::drawPath(p); - if (!continueCall()) - return; - } - if (d->clipEnabled && d->allClipped) return; if (!d->hasPen && !d->hasBrush) @@ -1176,12 +1159,6 @@ void QPdfEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) { Q_D(QPdfEngine); - if (d->useAlphaEngine) { - QAlphaPaintEngine::drawTextItem(p, textItem); - if (!continueCall()) - return; - } - if (!d->hasPen || (d->clipEnabled && d->allClipped)) return; @@ -1213,12 +1190,6 @@ void QPdfEngine::updateState(const QPaintEngineState &state) { Q_D(QPdfEngine); - if (d->useAlphaEngine) { - QAlphaPaintEngine::updateState(state); - if (!continueCall()) - return; - } - QPaintEngine::DirtyFlags flags = state.state(); if (flags & DirtyTransform) @@ -1335,31 +1306,6 @@ void QPdfEngine::updateClipPath(const QPainterPath &p, Qt::ClipOperation op) d->clips.clear(); d->clips.append(path); } - - if (d->useAlphaEngine) { - // if we have an alpha region, we have to subtract that from the - // any existing clip region since that region will be filled in - // later with images - QPainterPath alphaClip = qt_regionToPath(alphaClipping()); - if (!alphaClip.isEmpty()) { - if (!d->clipEnabled) { - QRect r = d->fullPage ? d->paperRect() : d->pageRect(); - QPainterPath dev; - dev.addRect(QRect(0, 0, r.width(), r.height())); - if (path.isEmpty()) - path = dev; - else - path = path.intersected(dev); - d->clipEnabled = true; - } else { - path = painter()->clipPath(); - path = d->stroker.matrix.map(path); - } - path = path.subtracted(alphaClip); - d->clips.clear(); - d->clips.append(path); - } - } } void QPdfEngine::setPen() @@ -1517,7 +1463,6 @@ int QPdfEngine::metric(QPaintDevice::PaintDeviceMetric metricType) const QPdfEnginePrivate::QPdfEnginePrivate() : clipEnabled(false), allClipped(false), hasPen(true), hasBrush(false), simplePen(false), - useAlphaEngine(false), outDevice(0), fd(-1), fullPage(false), embedFonts(true), landscape(false), |