1 files changed, 69 insertions, 36 deletions

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 5950fac..5f9d1dd 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -68,6 +68,7 @@
 
 QT_BEGIN_NAMESPACE
 
+
 double qstrtod(const char *s00, char const **se, bool *ok);
 
 static bool parsePathDataFast(const QStringRef &data, QPainterPath &path);
@@ -320,6 +321,7 @@ static qreal toDouble(const QChar *&str)
             ++str;
         }
     }
+
     temp[pos] = '\0';
 
     qreal val;
@@ -365,16 +367,24 @@ static qreal toDouble(const QChar *&str)
     return val;
 
 }
-static qreal toDouble(const QString &str)
+static qreal toDouble(const QString &str, bool *ok = NULL)
 {
     const QChar *c = str.constData();
-    return toDouble(c);
+    qreal res = toDouble(c);
+    if (ok) {
+        *ok = ((*c) == QLatin1Char('\0'));
+    }
+    return res;
 }
 
-static qreal toDouble(const QStringRef &str)
+static qreal toDouble(const QStringRef &str, bool *ok = NULL)
 {
     const QChar *c = str.constData();
-    return toDouble(c);
+    qreal res = toDouble(c);
+    if (ok) {
+        *ok = (c == (str.constData() + str.length()));
+    }
+    return res;
 }
 
 static QVector<qreal> parseNumbersList(const QChar *&str)
@@ -497,14 +507,17 @@ static bool constructColor(const QString &colorStr, const QString &opacity,
     if (!resolveColor(colorStr, color, handler))
         return false;
     if (!opacity.isEmpty()) {
-        qreal op = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)));
+        bool ok = true;
+        qreal op = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity, &ok)));
+        if (!ok)
+            op = 1.0;
         color.setAlphaF(op);
     }
     return true;
 }
 
 static qreal parseLength(const QString &str, QSvgHandler::LengthType &type,
-                         QSvgHandler *handler)
+                         QSvgHandler *handler, bool *ok = NULL)
 {
     QString numStr = str.trimmed();
 
@@ -533,15 +546,15 @@ static qreal parseLength(const QString &str, QSvgHandler::LengthType &type,
         type = handler->defaultCoordinateSystem();
         //type = QSvgHandler::LT_OTHER;
     }
-    qreal len = toDouble(numStr);
+    qreal len = toDouble(numStr, ok);
     //qDebug()<<"len is "<<len<<", from '"<<numStr << "'";
     return len;
 }
 
-static inline qreal convertToNumber(const QString &str, QSvgHandler *handler)
+static inline qreal convertToNumber(const QString &str, QSvgHandler *handler, bool *ok = NULL)
 {
     QSvgHandler::LengthType type;
-    qreal num = parseLength(str, type, handler);
+    qreal num = parseLength(str, type, handler, ok);
     if (type == QSvgHandler::LT_PERCENT) {
         num = num/100.0;
     }
@@ -631,15 +644,32 @@ static void parseBrush(QSvgNode *node,
     QString opacity = attributes.value(QLatin1String("fill-opacity")).toString();
     QString myId = someId(attributes);
 
-    value = value.trimmed();
-    fillRule = fillRule.trimmed();
-    if (!value.isEmpty() || !fillRule.isEmpty()) {
-        Qt::FillRule f = Qt::WindingFill;
+    QSvgFillStyle *inherited =
+                static_cast<QSvgFillStyle*>(node->parent()->styleProperty(
+                                                QSvgStyleProperty::FILL));
+    QSvgFillStyle *prop = new QSvgFillStyle(QColor(Qt::black));
+
+    //fill-rule attribute handling
+    Qt::FillRule f = Qt::WindingFill;
+    if (!fillRule.isEmpty() && fillRule != QLatin1String("inherit")) {
         if (fillRule == QLatin1String("evenodd"))
             f = Qt::OddEvenFill;
+    } else if (inherited) {
+        f = inherited->fillRule();
+    }
+
+    //fill-opacity atttribute handling
+    qreal fillOpacity = 1.0;
+    if (!opacity.isEmpty() && opacity != QLatin1String("inherit")) {
+        fillOpacity = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)));
+    } else if (inherited) {
+        fillOpacity = inherited->fillOpacity();
+    }
+
+    //fill attribute handling
+    if ((!value.isEmpty()) && (value != QLatin1String("inherit")) ) {
         if (value.startsWith(QLatin1String("url"))) {
             value = value.remove(0, 3);
-            QSvgFillStyle *prop = new QSvgFillStyle(0);
             QSvgStyleProperty *style = styleFromUrl(node, value);
             if (style) {
                 prop->setFillStyle(style);
@@ -648,30 +678,26 @@ static void parseBrush(QSvgNode *node,
                 prop->setGradientId(id);
                 prop->setGradientResolved(false);
             }
-            if (!opacity.isEmpty()) {
-                qreal clampedOpacity = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)));
-                prop->setFillOpacity(clampedOpacity);
-            }
-            if (!fillRule.isEmpty())
-                prop->setFillRule(f);
-            node->appendStyleProperty(prop,myId);
         } else if (value != QLatin1String("none")) {
             QColor color;
-            if (constructColor(value, opacity, color, handler)) {
-                QSvgFillStyle *prop = new QSvgFillStyle(QBrush(color));
-                if (!fillRule.isEmpty())
-                    prop->setFillRule(f);
-                node->appendStyleProperty(prop, myId);
-            }
+            if (resolveColor(value, color, handler))
+                prop->setBrush(QBrush(color));
         } else {
-            QSvgFillStyle *prop = new QSvgFillStyle(QBrush(Qt::NoBrush));
-            if (!fillRule.isEmpty())
-                prop->setFillRule(f);
-            node->appendStyleProperty(prop, myId);
+            prop->setBrush(QBrush(Qt::NoBrush));
+        }
+    } else if (inherited) {
+        if (inherited->style()) {
+            prop->setFillStyle(inherited->style());
+        } else {
+            prop->setBrush(inherited->qbrush());
         }
     }
+    prop->setFillOpacity(fillOpacity);
+    prop->setFillRule(f);
+    node->appendStyleProperty(prop,myId);
 }
 
+
 static void parseQPen(QPen &pen, QSvgNode *node,
                       const QSvgAttributes &attributes,
                       QSvgHandler *handler)
@@ -3006,7 +3032,11 @@ static bool parseStopNode(QSvgStyleProperty *parent,
     QString colorStr    = attrs.value(QString(), QLatin1String("stop-color")).toString();
     QString opacityStr  = attrs.value(QString(), QLatin1String("stop-opacity")).toString();
     QColor color;
-    qreal offset = convertToNumber(offsetStr, handler);
+
+    bool ok = true;
+    qreal offset = convertToNumber(offsetStr, handler, &ok);
+    if (!ok)
+        offset = 0.0;
     if (colorStr.isEmpty()) {
         colorStr = QLatin1String("#000000");
     }
@@ -3095,12 +3125,16 @@ static QSvgNode *createSvgNode(QSvgNode *parent,
         QStringList lst = viewBoxStr.split(QLatin1Char(' '), QString::SkipEmptyParts);
         if (lst.count() != 4)
             lst = viewBoxStr.split(QLatin1Char(','), QString::SkipEmptyParts);
+        int count = lst.count();
+        while (count < 4) {
+            lst.append(QLatin1String(""));
+            count++;
+        }
         QString xStr      = lst.at(0).trimmed();
         QString yStr      = lst.at(1).trimmed();
         QString widthStr  = lst.at(2).trimmed();
         QString heightStr = lst.at(3).trimmed();
 
-
         QSvgHandler::LengthType lt;
         qreal x = parseLength(xStr, lt, handler);
         qreal y = parseLength(yStr, lt, handler);
@@ -3108,15 +3142,14 @@ static QSvgNode *createSvgNode(QSvgNode *parent,
         qreal h = parseLength(heightStr, lt, handler);
 
         node->setViewBox(QRectF(x, y, w, h));
-    } else if (width && height){
+
+    } else if (width && height) {
         if (type == QSvgHandler::LT_PT) {
             width = convertToPixels(width, false, type);
             height = convertToPixels(height, false, type);
         }
-
         node->setViewBox(QRectF(0, 0, width, height));
     }
-
     handler->setDefaultCoordinateSystem(QSvgHandler::LT_PX);
 
     return node;