AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QTransform::transposed() result having wrong transformation type

Browse Source 
The implementation of QTransform::transposed() had a wrong assumption
about the type of the result.

Task-number: QTBUG-68630
Change-Id: Ia5ce794efe773d74fb5fdaff3da8cae2b452e7e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Eirik Aavitsland 2018-06-05 11:06:59 +02:00
parent 6108d8f515
commit d9d77e8680
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qtransform.cpp
View File

@ -352,8 +352,6 @@ QTransform QTransform::transposed() const
QTransform t(affine._m11, affine._m21, affine._dx,
affine._m12, affine._m22, affine._dy,
m_13, m_23, m_33, true);
t.m_type = m_type;
t.m_dirty = m_dirty;
return t;
}

35
tests/auto/gui/painting/qtransform/tst_qtransform.cpp
View File

@ -49,6 +49,8 @@ private slots:
void matrix();
void testOffset();
void types();
void types2_data();
void types2();
void scalarOps();
void transform();
void mapEmptyPath();
@ -65,6 +67,7 @@ private:
};
Q_DECLARE_METATYPE(QTransform)
Q_DECLARE_METATYPE(QTransform::TransformationType)
void tst_QTransform::mapRect_data()
{
@ -568,6 +571,38 @@ void tst_QTransform::types()
QCOMPARE(m5.type(), QTransform::TxScale);
}
void tst_QTransform::types2_data()
{
QTest::addColumn<QTransform>("t1");
QTest::addColumn<QTransform::TransformationType>("type");
QTest::newRow( "identity" ) << QTransform() << QTransform::TxNone;
QTest::newRow( "translate" ) << QTransform().translate(10, -0.1) << QTransform::TxTranslate;
QTest::newRow( "scale" ) << QTransform().scale(10, -0.1) << QTransform::TxScale;
QTest::newRow( "rotate" ) << QTransform().rotate(10) << QTransform::TxRotate;
QTest::newRow( "shear" ) << QTransform().shear(10, -0.1) << QTransform::TxShear;
QTest::newRow( "project" ) << QTransform().rotate(10, Qt::XAxis) << QTransform::TxProject;
QTest::newRow( "combined" ) << QTransform().translate(10, -0.1).scale(10, -0.1).rotate(10, Qt::YAxis) << QTransform::TxProject;
}
void tst_QTransform::types2()
{
#define CHECKTXTYPE(func) { QTransform t2(func); \
QTransform t3(t2.m11(), t2.m12(), t2.m13(), t2.m21(), t2.m22(), t2.m23(), t2.m31(), t2.m32(), t2.m33()); \
QVERIFY2(t3.type() == t2.type(), #func); \
}
QFETCH( QTransform, t1 );
QFETCH( QTransform::TransformationType, type );
Q_ASSERT(t1.type() == type);
CHECKTXTYPE(t1.adjoint());
CHECKTXTYPE(t1.inverted());
CHECKTXTYPE(t1.transposed());
#undef CHECKTXTYPE
}
void tst_QTransform::scalarOps()
{