summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/svg/qsvgstyle.cpp21
-rw-r--r--src/svg/qsvgstyle_p.h4
2 files changed, 17 insertions, 8 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index e3fc79f..3cf88e0 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -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);
}
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index 53b9871..1c9537f 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -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;