From 16c05a6d9a02a193fbd76975bcef90f11bcee953 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 23 Aug 2021 02:29:39 +0300 Subject: [PATCH] assume scale argument is not null in qt_scaleForTransform() Signed-off-by: Ivailo Monev --- src/gui/painting/qtransform.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 9b5066d71..012710ac8 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1531,16 +1531,15 @@ static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transfor Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale) { + Q_ASSERT(scale); const QTransform::TransformationType type = transform.type(); if (type <= QTransform::TxTranslate) { - if (scale) - *scale = 1; + *scale = 1; return true; } else if (type == QTransform::TxScale) { const qreal xScale = qAbs(transform.m11()); const qreal yScale = qAbs(transform.m22()); - if (scale) - *scale = qMax(xScale, yScale); + *scale = qMax(xScale, yScale); return qFuzzyCompare(xScale, yScale); } @@ -1548,8 +1547,7 @@ bool qt_scaleForTransform(const QTransform &transform, qreal *scale) + transform.m21() * transform.m21(); const qreal yScale = transform.m12() * transform.m12() + transform.m22() * transform.m22(); - if (scale) - *scale = qSqrt(qMax(xScale, yScale)); + *scale = qSqrt(qMax(xScale, yScale)); return type == QTransform::TxRotate && qFuzzyCompare(xScale, yScale); } static inline bool cubicTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, const QPointF &c, const QPointF &d, bool needsMoveTo)