Merge pull request #28 from paulushub/master

Code improvements to remove build warnings

Author: jogibear9988

Source/SVGImage/SVG/SVGRender.cs

@@ -460,11 +460,11 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
                 if (shape is PathShape)
                 {
                     PathShape r = shape as PathShape;
-                    PathFigure p = null;
+//                    PathFigure p = null;
                     Point lastPoint = new Point(0, 0);
 
-                    PathShape.CurveTo lastc = null;
-                    PathShape.QuadraticCurveTo lastq = null;
+//                    PathShape.CurveTo lastc = null;
+//                    PathShape.QuadraticCurveTo lastq = null;
                     Point lastcirPoint = new Point(0, 0);
                     PathGeometry path = PathGeometry.CreateFromGeometry(PathGeometry.Parse(r.Data));
                     //PathGeometry path = new PathGeometry();

Source/SVGImage/SVG/SVGTags.cs

@@ -1,6 +1,6 @@
 namespace SVGImage.SVG
 {
-    class SVGTags
+    static class SVGTags
     {
         public const string sSvg = "svg";
         public const string sNsSvg = "http://www.w3.org/2000/svg";

Source/SVGImage/SVG/ShapeUtil.cs

@@ -7,7 +7,7 @@
 
 namespace SVGImage.SVG
 {
-	public class ShapeUtil
+	public static class ShapeUtil
 	{
 		public static Transform ParseTransform(string value)
 		{

Source/SVGImage/SVG/Shapes/ImageShape.cs

@@ -1,8 +1,10 @@
 using System;
 using System.IO;
+using System.Xml;
+using System.Diagnostics;
+
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Xml;
 
 namespace SVGImage.SVG.Shapes
 {
@@ -44,8 +46,10 @@ public ImageShape(SVG svg, XmlNode node) : base(svg, node)
                     b.EndInit();
                     this.ImageSource = b;
                 }
-                catch(Exception ex)
-                { }
+                catch (Exception ex)
+                {
+                    Trace.TraceError(ex.Message);
+                }
             }
         }
     }

Source/SVGImage/SVG/TextRender.cs

@@ -1,11 +1,15 @@
 using System.Collections.Generic;
 using System.Windows.Media;
 using System.Windows;
+using System.Reflection;
 
 namespace SVGImage.SVG
 {
-	class TextRender
+	static class TextRender
 	{
+		private static int dpiX = 0;
+		private static int dpiY = 0;
+
 		static public GeometryGroup BuildTextGeometry(TextShape shape)
 		{
 			return BuildGlyphRun(shape, 0, 0);
@@ -76,6 +80,15 @@ static Geometry BuildGlyphRun(TextStyle textStyle, string text, double x, double
             if (string.IsNullOrEmpty(text))
                 return new GeometryGroup();
 
+			if (dpiX == 0 || dpiY == 0)
+            {
+				var sysPara = typeof(SystemParameters);
+				var dpiXProperty = sysPara.GetProperty("DpiX", BindingFlags.NonPublic | BindingFlags.Static);
+				var dpiYProperty = sysPara.GetProperty("Dpi", BindingFlags.NonPublic | BindingFlags.Static);
+
+				dpiX = (int)dpiXProperty.GetValue(null, null);
+				dpiY = (int)dpiYProperty.GetValue(null, null);
+            }
 			double fontSize = textStyle.FontSize;
 			GlyphRun glyphs = null;
 			Typeface font = new Typeface(new FontFamily(textStyle.FontFamily), 
@@ -87,7 +100,13 @@ static Geometry BuildGlyphRun(TextStyle textStyle, string text, double x, double
 			double baseline = y;
 			if (font.TryGetGlyphTypeface(out glyphFace))
 			{
+#if DOTNET40 || DOTNET45 || DOTNET46
 				glyphs = new GlyphRun();
+#else
+				var dpiScale = new DpiScale(dpiX, dpiY);
+
+				glyphs = new GlyphRun((float)dpiScale.PixelsPerDip);
+#endif
 				((System.ComponentModel.ISupportInitialize)glyphs).BeginInit();
 				glyphs.GlyphTypeface = glyphFace;
 				glyphs.FontRenderingEmSize = fontSize;