Skip to content
GitLab

Source

Target

Commits (1)
  • Edward Welbourne's avatar
    QSvgAnimate{Color,Transform}: initialize all members. · 415572bb
    Edward Welbourne authored 
    
Coverity (CIDs 22640, 22316) complained that some members weren't
initialized.  Although setters are provided for these members, we have
no guarantee that they're called, so initialize to sensible values.
Chose indefinite repeat (repeat count -1) rather than single-shot.

In the process, discovered each class's m_to was used only in the
constructor (my initial change removed even this use, leading to a
compiler warning, as error, on OSX); so removed from both classes.

Change-Id: Ibb88a6190f2d740f57c67c1d5ee8a7b03129c510
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
    415572bb
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 8 deletions
src/svg/qsvgstyle.cpp
View file @ 415572bb
......@@ -629,10 +629,16 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs )
: QSvgStyleProperty(),
m_from(startMs), m_to(endMs),
m_type(Empty), m_additive(Replace), m_count(0), m_finished(false), m_transformApplied(false)
m_from(startMs),
m_totalRunningTime(endMs - startMs),
m_type(Empty),
m_additive(Replace),
m_count(0),
m_finished(false),
m_freeze(false),
m_repeatCount(-1.),
m_transformApplied(false)
{
m_totalRunningTime = m_to - m_from;
Q_UNUSED(byMs);
}
......@@ -801,10 +807,13 @@ void QSvgAnimateTransform::setRepeatCount(qreal repeatCount)
QSvgAnimateColor::QSvgAnimateColor(int startMs, int endMs, int byMs)
: QSvgStyleProperty(),
m_from(startMs), m_to(endMs),
m_finished(false)
m_from(startMs),
m_totalRunningTime(endMs - startMs),
m_fill(false),
m_finished(false),
m_freeze(false),
m_repeatCount(-1.)
{
m_totalRunningTime = m_to - m_from;
Q_UNUSED(byMs);
}
......
src/svg/qsvgstyle_p.h
View file @ 415572bb
......@@ -680,7 +680,7 @@ public:
protected:
void resolveMatrix(const QSvgNode *node);
private:
qreal m_from, m_to;
qreal m_from;
qreal m_totalRunningTime;
TransformType m_type;
Additive m_additive;
......@@ -706,7 +706,7 @@ public:
virtual void revert(QPainter *p, QSvgExtraStates &states);
virtual Type type() const;
private:
qreal m_from, m_to;
qreal m_from;
qreal m_totalRunningTime;
QList<QColor> m_colors;
QBrush m_oldBrush;
......