summaryrefslogtreecommitdiffstats
path: root/src/openvg/qpaintengine_vg.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-22 08:27:18 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-22 08:27:18 (GMT)
commit79a093b7f4c78994504a0a9e306169df1eb4c7a3 (patch)
tree550e41461cf539a70e3e78d2ce6ccf70a92e9ed0 /src/openvg/qpaintengine_vg.cpp
parent27688a5e317f6602752eaea257ba46abbc9acf44 (diff)
downloadQt-79a093b7f4c78994504a0a9e306169df1eb4c7a3.zip
Qt-79a093b7f4c78994504a0a9e306169df1eb4c7a3.tar.gz
Qt-79a093b7f4c78994504a0a9e306169df1eb4c7a3.tar.bz2
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
This reverts commit 27688a5e317f6602752eaea257ba46abbc9acf44.
Diffstat (limited to 'src/openvg/qpaintengine_vg.cpp')
-rw-r--r--src/openvg/qpaintengine_vg.cpp6
1 files changed, 3 insertions, 3 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 {