diff options
Diffstat (limited to 'tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp')
| -rw-r--r-- | tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index ca05a3a..686c854 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -270,18 +270,17 @@ void tst_QSvgRenderer::testMapViewBoxToTarget() QCOMPARE(picture.boundingRect(), QRect(125, 125, 250, 250)); } -#if 0 // Requires keep-aspectratio feature { // Viewport and viewBox specified -> scale 500x500 square to 1000x750 while preserving aspect ratio gives 750x750 data = "<svg width=\"1000\" height=\"750\" viewBox=\"-250 -250 500 500\"><g><rect x=\"0\" y=\"0\" width=\"500\" height=\"500\" /></g></svg>"; QPicture picture; QPainter painter(&picture); QSvgRenderer rend(data); + rend.setAspectRatioMode(Qt::KeepAspectRatio); rend.render(&painter); painter.end(); QCOMPARE(picture.boundingRect(), QRect(500, 375, 750, 750)); } -#endif } void tst_QSvgRenderer::testRenderElement() @@ -564,15 +563,15 @@ void tst_QSvgRenderer::matrixForElement() const QPainter painter(&image); QSvgRenderer renderer(data); - compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("ichi")))); + compareTransforms(painter.worldTransform(), renderer.transformForElement(QLatin1String("ichi"))); painter.translate(-3, 1); - compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("ni")))); + compareTransforms(painter.worldTransform(), renderer.transformForElement(QLatin1String("ni"))); painter.rotate(45); - compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("san")))); + compareTransforms(painter.worldTransform(), renderer.transformForElement(QLatin1String("san"))); painter.scale(4, 2); - compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("yon")))); + compareTransforms(painter.worldTransform(), renderer.transformForElement(QLatin1String("yon"))); painter.setWorldTransform(QTransform(1, 2, 3, 4, 5, 6), true); - compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("firkant")))); + compareTransforms(painter.worldTransform(), renderer.transformForElement(QLatin1String("firkant"))); } void tst_QSvgRenderer::boundsOnElement() const |