diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-27 09:12:03 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-27 09:12:03 (GMT) |
| commit | a6fe69bf93171b522231b7ec2f4a794e82321d80 (patch) | |
| tree | 6c30b48c6840cb089a4328924a199afa6ccfe64c /src | |
| parent | ebed13e649c1572ed85cb841252e73a479516052 (diff) | |
| download | Qt-a6fe69bf93171b522231b7ec2f4a794e82321d80.zip Qt-a6fe69bf93171b522231b7ec2f4a794e82321d80.tar.gz Qt-a6fe69bf93171b522231b7ec2f4a794e82321d80.tar.bz2 | |
Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 10 | ||||
| -rw-r--r-- | src/openvg/qpaintengine_vg_p.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 312408e..f602c73 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -3279,7 +3279,7 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) QTransform matrix; ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions); - if (!drawCachedGlyphs(glyphs.size(), glyphs.data(), ti.font(), ti.fontEngine, positions.data(), p)) + if (!drawCachedGlyphs(glyphs.size(), glyphs.data(), ti.font(), ti.fontEngine, p, positions.data())) QPaintEngineEx::drawTextItem(p, textItem); #else // OpenGL 1.0 does not have support for VGFont and glyphs, @@ -3291,12 +3291,12 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) { drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->font, textItem->fontEngine, - textItem->positions, QPointF(0, 0)); + QPointF(0, 0), textItem->glyphPositions); } bool QVGPaintEngine::drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFont &font, - QFontEngine *fontEngine, const QFixedPoint *positions, - const QPointF &p) + QFontEngine *fontEngine, const QPointF &p, + const QFixedPoint *positions) { #if !defined(QVG_NO_DRAW_GLYPHS) Q_D(QVGPaintEngine); @@ -3365,8 +3365,8 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) Q_UNUSED(glyphs); Q_UNUSED(font); Q_UNUSED(fontEngine); - Q_UNUSED(positions); Q_UNUSED(p); + Q_UNUSED(positions); return false; #endif } diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h index 24de07c..33c49ba 100644 --- a/src/openvg/qpaintengine_vg_p.h +++ b/src/openvg/qpaintengine_vg_p.h @@ -144,7 +144,8 @@ public: void drawTextItem(const QPointF &p, const QTextItem &textItem); void drawStaticTextItem(QStaticTextItem *staticTextItem); bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFont &font, - QFontEngine *fontEngine, const QFixedPoint *positions, const QPointF &p) + QFontEngine *fontEngine, const QPointF &p, + const QFixedPoint *positions); void setState(QPainterState *s); QVGPainterState *state() { return static_cast<QVGPainterState *>(QPaintEngineEx::state()); } |