diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-06-06 22:30:48 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-06-21 20:31:23 +0000 |
| commit | 67776febd50bba009bd806365b4e94a851c31548 (patch) | |
| tree | 7d0325b8366ae2cd658498dfd947a15ee1d765b9 /src/gui/painting/qtransform.cpp | |
| parent | af837f964781d61fd086b010cc79abf1462fcf11 (diff) | |
Fix the qHash implementation for QMatrix / QTransform
The order of the arguments of QHashCombine::operator() was
accidentally swapped -- the first is supposed to be the
accumlated value, the second the new value to combine.
[ChangeLog][QtGui][QMatrix] The qHash() implementation for
QMatrix has been changed.
[ChangeLog][QtGui][QTransform] The qHash() implementation for
QTransform has been changed.
Change-Id: Iba13f76ff734a2184c96184ee0e5748c05db07fa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting/qtransform.cpp')
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index c5e296b293..040d33fc2a 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -798,15 +798,15 @@ bool QTransform::operator==(const QTransform &o) const uint qHash(const QTransform &key, uint seed) Q_DECL_NOTHROW { QtPrivate::QHashCombine hash; - seed = hash(key.m11(), seed); - seed = hash(key.m12(), seed); - seed = hash(key.m21(), seed); - seed = hash(key.m22(), seed); - seed = hash(key.dx(), seed); - seed = hash(key.dy(), seed); - seed = hash(key.m13(), seed); - seed = hash(key.m23(), seed); - seed = hash(key.m33(), seed); + seed = hash(seed, key.m11()); + seed = hash(seed, key.m12()); + seed = hash(seed, key.m21()); + seed = hash(seed, key.m22()); + seed = hash(seed, key.dx()); + seed = hash(seed, key.dy()); + seed = hash(seed, key.m13()); + seed = hash(seed, key.m23()); + seed = hash(seed, key.m33()); return seed; } |