diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 37a88a3..4c35004 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3353,6 +3353,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte break; default: Q_ASSERT(false); + depth = 0; }; for(int i = 0; i < glyphs.size(); i++) { @@ -3380,6 +3381,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte break; default: Q_ASSERT(false); + pitch = 0; }; alphaPenBlt(glyph->data, pitch, depth, diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 638bfb3..eda8d83 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -3690,10 +3690,10 @@ void QOpenGLPaintEngine::drawLines(const QLineF *lines, int lineCount) bool useRects = false; // scale or 90 degree rotation? if (d->matrix.type() <= QTransform::TxTranslate - || !d->cpen.isCosmetic() - && (d->matrix.type() <= QTransform::TxScale - || (d->matrix.type() == QTransform::TxRotate - && d->matrix.m11() == 0 && d->matrix.m22() == 0))) { + || (!d->cpen.isCosmetic() + && (d->matrix.type() <= QTransform::TxScale + || (d->matrix.type() == QTransform::TxRotate + && d->matrix.m11() == 0 && d->matrix.m22() == 0)))) { useRects = true; for (int i = 0; i < lineCount; ++i) { if (lines[i].p1().x() != lines[i].p2().x() |