diff options
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 3 | ||||
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 28 |
2 files changed, 9 insertions, 22 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 35b8595..497ea76 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1203,10 +1203,9 @@ static void parsePen(QSvgNode *node, } //stroke-width handling - qreal w = 0; if (!attributes.strokeWidth.isEmpty() && attributes.strokeWidth != QT_INHERIT) { QSvgHandler::LengthType lt; - prop->setWidth(w = parseLength(attributes.strokeWidth.toString(), lt, handler)); + prop->setWidth(parseLength(attributes.strokeWidth.toString(), lt, handler)); } //stroke-dasharray diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index e3b75d0..a6c703f 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -697,14 +697,12 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node) case Translate: { startElem *= 3; endElem *= 3; - qreal from1, from2, from3; - qreal to1, to2, to3; + qreal from1, from2; + qreal to1, to2; from1 = m_args[startElem++]; from2 = m_args[startElem++]; - from3 = m_args[startElem++]; to1 = m_args[endElem++]; to2 = m_args[endElem++]; - to3 = m_args[endElem++]; qreal transXDiff = (to1-from1) * percentOfAnimation; qreal transX = from1 + transXDiff; @@ -717,14 +715,12 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node) case Scale: { startElem *= 3; endElem *= 3; - qreal from1, from2, from3; - qreal to1, to2, to3; + qreal from1, from2; + qreal to1, to2; from1 = m_args[startElem++]; from2 = m_args[startElem++]; - from3 = m_args[startElem++]; to1 = m_args[endElem++]; to2 = m_args[endElem++]; - to3 = m_args[endElem++]; qreal transXDiff = (to1-from1) * percentOfAnimation; qreal transX = from1 + transXDiff; @@ -764,14 +760,10 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node) case SkewX: { startElem *= 3; endElem *= 3; - qreal from1, from2, from3; - qreal to1, to2, to3; + qreal from1; + qreal to1; from1 = m_args[startElem++]; - from2 = m_args[startElem++]; - from3 = m_args[startElem++]; to1 = m_args[endElem++]; - to2 = m_args[endElem++]; - to3 = m_args[endElem++]; qreal transXDiff = (to1-from1) * percentOfAnimation; qreal transX = from1 + transXDiff; @@ -782,14 +774,10 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node) case SkewY: { startElem *= 3; endElem *= 3; - qreal from1, from2, from3; - qreal to1, to2, to3; + qreal from1; + qreal to1; from1 = m_args[startElem++]; - from2 = m_args[startElem++]; - from3 = m_args[startElem++]; to1 = m_args[endElem++]; - to2 = m_args[endElem++]; - to3 = m_args[endElem++]; qreal transYDiff = (to1 - from1) * percentOfAnimation; |