From 79a093b7f4c78994504a0a9e306169df1eb4c7a3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 22 Apr 2010 10:27:18 +0200 Subject: Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp" This reverts commit 27688a5e317f6602752eaea257ba46abbc9acf44. --- src/openvg/qpaintengine_vg.cpp | 6 +++--- src/openvg/qpaintengine_vg_p.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 0855da2..4b4333b 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -3292,7 +3292,7 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) ti.fontEngine->getGlyphPositions (ti.glyphs, matrix, ti.flags, glyphs, positions); - if (!drawCachedGlyphs(glyphs.size(), glyphs.data(), ti.font(), ti.fontEngine, p, ti.renderFlags())) + if (!drawCachedGlyphs(glyphs.size(), glyphs.data(), ti.font(), ti.fontEngine, p)) QPaintEngineEx::drawTextItem(p, textItem); #else // OpenGL 1.0 does not have support for VGFont and glyphs, @@ -3308,7 +3308,7 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) } bool QVGPaintEngine::drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFont &font, - QFontEngine *fontEngine, const QPointF &p, QTextItem::RenderFlags renderFlags) + QFontEngine *fontEngine, const QPointF &p) { #if !defined(QVG_NO_DRAW_GLYPHS) Q_D(QVGPaintEngine); @@ -3361,7 +3361,7 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) // Draw the glyphs. We need to fill with the brush associated with // the Qt pen, not the Qt brush. d->ensureBrush(state()->pen.brush()); - if (renderFlags & QTextItem::RightToLeft) { + if (ti.renderFlags() & QTextItem::RightToLeft) { for (int index = numGlyphs - 1; index >= 0; --index) vgDrawGlyph(glyphCache->font, glyphs[index], VG_FILL_PATH, VG_TRUE); } else { diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h index 8aeab47..1e7e26c 100644 --- a/src/openvg/qpaintengine_vg_p.h +++ b/src/openvg/qpaintengine_vg_p.h @@ -143,7 +143,7 @@ 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 QPointF &p, QTextItem::RenderFlags renderFlags); + QFontEngine *fontEngine, const QPointF &p); void setState(QPainterState *s); QVGPainterState *state() { return static_cast(QPaintEngineEx::state()); } -- cgit v0.12