Bug fixes and code improvements

- Resolved transform parsing issue #14
- Resolved CSS parser key duplication issue

Author: paulushub

Source/SVGImage/SVG/CSS/StyleParser.cs

@@ -10,17 +10,22 @@ public static class StyleParser
 
         public static void ParseStyle(SVG svg, string style)
         {
+            var svgStyles = svg.Styles;
+
             var match = _regexStyle.Match(style);
             while (match.Success)
             {
-                var name = match.Groups[1].Value.Trim();
+                var name  = match.Groups[1].Value.Trim();
                 var value = match.Groups[2].Value.Trim();
                 foreach (var nm in name.Split(','))
                 {
-                    svg.m_styles.Add(nm, new List<XmlUtil.StyleItem>());
+                    if (!svgStyles.ContainsKey(nm))
+                    {
+                        svgStyles.Add(nm, new List<XmlUtil.StyleItem>());
+                    }
                     foreach (ShapeUtil.Attribute styleitem in XmlUtil.SplitStyle(svg, value))
                     {
-                        svg.m_styles[nm].Add(new XmlUtil.StyleItem(styleitem.Name, styleitem.Value));
+                        svgStyles[nm].Add(new XmlUtil.StyleItem(styleitem.Name, styleitem.Value));
                     }
                 }
 

Source/SVGImage/SVG/SVG.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.IO.Compression;
 using System.Xml;
 using System.Linq;
 using System.Text;
@@ -91,6 +92,13 @@ public Dictionary<string, Brush> CustomBrushes
             }
         }
 
+        internal IDictionary<string, List<XmlUtil.StyleItem>> Styles
+        {
+            get {
+                return m_styles;
+            }
+        }
+
         public void AddShape(string id, Shape shape)
         {
             //System.Diagnostics.Debug.Assert(id.Length > 0 && this.m_shapes.ContainsKey(id) == false);
@@ -147,6 +155,24 @@ public void Load(string filePath)
             }
             this.Filename = filePath;
 
+            // Provide a support for the .svgz files...
+            UriBuilder fileUrl = new UriBuilder(filePath);
+            if (string.Equals(fileUrl.Scheme, "file"))
+            {
+                string fileExt = Path.GetExtension(filePath);
+                if (string.Equals(fileExt, ".svgz", StringComparison.OrdinalIgnoreCase))
+                {
+                    using (var fileStream = File.OpenRead(fileUrl.Uri.LocalPath))
+                    {
+                        using (var zipStream = new GZipStream(fileStream, CompressionMode.Decompress))
+                        {
+                            this.Load(zipStream);
+                        }
+                    }
+                    return;
+                }
+            }
+
             XmlDocument doc = new XmlDocument();
             doc.XmlResolver = null;
             doc.Load(filePath);
@@ -156,7 +182,12 @@ public void Load(string filePath)
 
         public void Load(Uri fileUri)
         {
-            var filePath = fileUri.IsFile ? fileUri.LocalPath : fileUri.ToString();
+            if (fileUri == null || !fileUri.IsAbsoluteUri)
+            {
+                return;
+            }
+
+            var filePath = fileUri.IsFile ? fileUri.LocalPath : fileUri.AbsoluteUri;
 
             if (string.IsNullOrWhiteSpace(filePath))
             {

Source/SVGImage/SVG/ShapeUtil.cs

@@ -20,14 +20,26 @@ public static Transform ParseTransform(string value)
             foreach (var transform in transforms.OrderBy(x => x.StartsWith(SVGTags.sTranslate))) // to check why ordering is needed (see acid.svg)
             {
                 if (!string.IsNullOrEmpty(transform))
-                    tg.Children.Add(ParseTransformInternal(transform + ")"));
+                {
+					var transObj = ParseTransformInternal(transform + ")");
+					if (transObj != null)
+                    {
+						tg.Children.Add(transObj);
+                    }
+                }
             }
             return tg;
 		}
 
 	    private static Transform ParseTransformInternal(string value)
 	    {
-	        string type = ExtractUntil(value, '(').TrimStart(',');
+			if (string.IsNullOrWhiteSpace(value))
+            {
+				return null;
+            }
+			value = value.Trim();
+
+			string type = ExtractUntil(value, '(').TrimStart(',');
 	        string v1 = ExtractBetween(value, '(', ')');
 
 	        ShapeUtil.StringSplitter split = new ShapeUtil.StringSplitter(v1);