Merge pull request #35 from paulushub/master

jogibear9988 · web-flow · commit cf08dc0c0488 · 2020-09-13T10:19:37.000+02:00
Bug Fix: ArgumentNullException bug in gradient rendering
diff --git a/Samples/ClipArtViewer/MainWindow.xaml.cs b/Samples/ClipArtViewer/MainWindow.xaml.cs
@@ -93,8 +93,6 @@ protected override void OnContentRendered(EventArgs e)
 
             ListFiles();
             DataContext = this;
-
-            tabPages.SelectedIndex = 0;
         }
 
         private void OnMainWindowLoaded(object sender, RoutedEventArgs e)
@@ -109,6 +107,9 @@ private void OnMainWindowLoaded(object sender, RoutedEventArgs e)
             }
 
             Trace.WriteLine("");
+
+            m_filelist.SelectedIndex = 0;
+            tabPages.SelectedIndex = 0;
         }
 
         private void OnMainWindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
diff --git a/Source/SVGImage/SVG/FileLoaders/FileSystemLoader.cs b/Source/SVGImage/SVG/FileLoaders/FileSystemLoader.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Diagnostics;
 
 namespace DotNetProjects.SVGImage.SVG.FileLoaders
 {
@@ -22,6 +23,9 @@ public Stream LoadFile(string hRef, string svgFilename)
             string filename = Path.Combine(path, hRef);
             if (File.Exists(filename))
                 return File.OpenRead(filename);
+
+            Trace.TraceWarning("Unresolved URI: " + hRef);
+
             return null;
         }
     }
diff --git a/Source/SVGImage/SVG/PaintServer/GradientColorPaintServer.cs b/Source/SVGImage/SVG/PaintServer/GradientColorPaintServer.cs
@@ -28,7 +28,7 @@ public GradientColorPaintServer(PaintServerManager owner, XmlNode node) : base(o
             {
                 string refid = XmlUtil.AttrValue(node, "xlink:href", string.Empty);
                 string paintServerKey = owner.Parse(refid.Substring(1));
-                GradientColorPaintServer refcol = owner.GetServers()[paintServerKey] as GradientColorPaintServer;
+                GradientColorPaintServer refcol = owner.GetServer(paintServerKey) as GradientColorPaintServer;
                 if (refcol == null) return;
                 this.m_stops = new List<GradientStop>(refcol.m_stops);
             }
diff --git a/Source/SVGImage/SVG/PaintServer/LinearGradientColorPaintServer.cs b/Source/SVGImage/SVG/PaintServer/LinearGradientColorPaintServer.cs
@@ -1,6 +1,7 @@
-﻿using System.Windows;
+﻿using System.Xml;
+
+using System.Windows;
 using System.Windows.Media;
-using System.Xml;
 
 namespace SVGImage.SVG.PaintServer
 {
@@ -28,6 +29,7 @@ public LinearGradientColorPaintServerPaintServer(PaintServerManager owner, Brush
         {
             Brush = newBrush;
         }
+
         public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rect bounds)
         {
             if (this.Brush != null) return this.Brush;
@@ -36,30 +38,30 @@ public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rec
             foreach (GradientStop stop in this.Stops) b.GradientStops.Add(stop);
 
             b.MappingMode = BrushMappingMode.RelativeToBoundingBox;
-            b.StartPoint = new System.Windows.Point(0, 0);
-            b.EndPoint = new System.Windows.Point(1, 0);
+            b.StartPoint = new Point(0, 0);
+            b.EndPoint = new Point(1, 0);
             
             if (this.GradientUnits == SVGTags.sUserSpaceOnUse)
             {
                 Transform tr = this.Transform as Transform;
                 if (tr != null)
                 {
-                    b.StartPoint = tr.Transform(new System.Windows.Point(this.X1, this.Y1));
-                    b.EndPoint = tr.Transform(new System.Windows.Point(this.X2, this.Y2));
+                    b.StartPoint = tr.Transform(new Point(this.X1, this.Y1));
+                    b.EndPoint = tr.Transform(new Point(this.X2, this.Y2));
                 }
                 else
                 {
-                    b.StartPoint = new System.Windows.Point(this.X1, this.Y1);
-                    b.EndPoint = new System.Windows.Point(this.X2, this.Y2);
+                    b.StartPoint = new Point(this.X1, this.Y1);
+                    b.EndPoint = new Point(this.X2, this.Y2);
                 }
                 this.Transform = null;
                 b.MappingMode = BrushMappingMode.Absolute;
             }
             else
             {
                 this.Normalize();
-                if (double.IsNaN(this.X1) == false) b.StartPoint = new System.Windows.Point(this.X1, this.Y1);
-                if (double.IsNaN(this.X2) == false) b.EndPoint = new System.Windows.Point(this.X2, this.Y2);
+                if (double.IsNaN(this.X1) == false) b.StartPoint = new Point(this.X1, this.Y1);
+                if (double.IsNaN(this.X2) == false) b.EndPoint = new Point(this.X2, this.Y2);
             }
 
             this.Brush = b;
diff --git a/Source/SVGImage/SVG/PaintServer/PaintServerManager.cs b/Source/SVGImage/SVG/PaintServer/PaintServerManager.cs
@@ -37,11 +37,21 @@ public string Create(SVG svg, XmlNode node)
 
         public void AddServer(string key, PaintServer server)
         {
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                return;
+            }
+
             m_servers[key] = server;
         }
 
         public PaintServer GetServer(string serverKey)
         {
+            if (string.IsNullOrWhiteSpace(serverKey))
+            {
+                return null;
+            }
+
             PaintServer result;
             if (serverKey != null && m_servers.TryGetValue(serverKey, out result)) return result;
             else return null;
diff --git a/Source/SVGImage/SVG/PaintServer/RadialGradientColorPaintServer.cs b/Source/SVGImage/SVG/PaintServer/RadialGradientColorPaintServer.cs
@@ -1,6 +1,7 @@
-﻿using System.Windows;
+﻿using System.Xml;
+
+using System.Windows;
 using System.Windows.Media;
-using System.Xml;
 
 namespace SVGImage.SVG.PaintServer
 {
@@ -40,15 +41,15 @@ public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rec
             RadialGradientBrush b = new RadialGradientBrush();
             foreach (GradientStop stop in this.Stops) b.GradientStops.Add(stop);
 
-            b.GradientOrigin = new System.Windows.Point(0.5, 0.5);
-            b.Center = new System.Windows.Point(0.5, 0.5);
+            b.GradientOrigin = new Point(0.5, 0.5);
+            b.Center = new Point(0.5, 0.5);
             b.RadiusX = 0.5;
             b.RadiusY = 0.5;
 
             if (this.GradientUnits == SVGTags.sUserSpaceOnUse)
             {
-                b.Center = new System.Windows.Point(this.CX, this.CY);
-                b.GradientOrigin = new System.Windows.Point(this.FX, this.FY);
+                b.Center = new Point(this.CX, this.CY);
+                b.GradientOrigin = new Point(this.FX, this.FY);
                 b.RadiusX = this.R;
                 b.RadiusY = this.R;
                 b.MappingMode = BrushMappingMode.Absolute;
@@ -58,12 +59,12 @@ public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rec
                 double scale = 1d / 100d;
                 if (double.IsNaN(this.CX) == false && double.IsNaN(this.CY) == false)
                 {
-                    //b.GradientOrigin = new System.Windows.Point(this.CX*scale, this.CY*scale);
-                    b.Center = new System.Windows.Point(this.CX /* *scale */, this.CY /* *scale */);
+                    //b.GradientOrigin = new Point(this.CX*scale, this.CY*scale);
+                    b.Center = new Point(this.CX /* *scale */, this.CY /* *scale */);
                 }
                 if (double.IsNaN(this.FX) == false && double.IsNaN(this.FY) == false)
                 {
-                    b.GradientOrigin = new System.Windows.Point(this.FX * scale, this.FY * scale);
+                    b.GradientOrigin = new Point(this.FX * scale, this.FY * scale);
                 }
                 if (double.IsNaN(this.R) == false)
                 {
diff --git a/Source/SVGImage/SVG/Shapes/ImageShape.cs b/Source/SVGImage/SVG/Shapes/ImageShape.cs
@@ -22,33 +22,44 @@ public class ImageShape : Shape
 
         public ImageShape(SVG svg, XmlNode node) : base(svg, node)
         {
-            this.X = XmlUtil.AttrValue(node, "x", 0, svg.Size.Width);
-            this.Y = XmlUtil.AttrValue(node, "y", 0, svg.Size.Height);
-            this.Width = XmlUtil.AttrValue(node, "width", 0, svg.Size.Width);
+            this.X      = XmlUtil.AttrValue(node, "x", 0, svg.Size.Width);
+            this.Y      = XmlUtil.AttrValue(node, "y", 0, svg.Size.Height);
+            this.Width  = XmlUtil.AttrValue(node, "width", 0, svg.Size.Width);
             this.Height = XmlUtil.AttrValue(node, "height", 0, svg.Size.Height);
             string hRef = XmlUtil.AttrValue(node, "xlink:href", string.Empty);
             if (hRef.Length > 0)
             {
                 try
                 {
-                    BitmapImage b = new BitmapImage();
-                    b.BeginInit();
-                    if (hRef.StartsWith("data:image/png;base64"))
+                    Stream imageStream = null;
+                    if (hRef.StartsWith("data:image/png;base64", StringComparison.OrdinalIgnoreCase))
                     {
-                        b.StreamSource = new MemoryStream(Convert.FromBase64String(hRef.Substring("data:image/png;base64,".Length)));
+                        var embeddedImage = hRef.Substring("data:image/png;base64,".Length);
+                        if (!string.IsNullOrWhiteSpace(embeddedImage))
+                        {
+                            imageStream = new MemoryStream(Convert.FromBase64String(embeddedImage));
+                        }
                     }
                     else
                     {
                         if (svg.ExternalFileLoader != null)
-                            b.StreamSource = svg.ExternalFileLoader.LoadFile(hRef, svg.Filename);
+                        {
+                            imageStream = svg.ExternalFileLoader.LoadFile(hRef, svg.Filename);
+                        }
                     }
+                    if (imageStream != null)
+                    {
+                        BitmapImage b = new BitmapImage();
+                        b.BeginInit();
+                        b.StreamSource = imageStream;
+                        b.EndInit();
 
-                    b.EndInit();
-                    this.ImageSource = b;
+                        this.ImageSource = b;
+                    }
                 }
                 catch (Exception ex)
                 {
-                    Trace.TraceError(ex.Message);
+                    Trace.TraceError(ex.ToString());
                 }
             }
         }
diff --git a/Tests/Images/CodeProjectLogo.jpg b/Tests/Images/CodeProjectLogo.jpg

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,6 @@ protected override void OnContentRendered(EventArgs e)`
`93`	`93`
`94`	`94`	`ListFiles();`
`95`	`95`	`DataContext = this;`
`96`		`-`
`97`		`- tabPages.SelectedIndex = 0;`
`98`	`96`	`}`
`99`	`97`
`100`	`98`	`private void OnMainWindowLoaded(object sender, RoutedEventArgs e)`
`@@ -109,6 +107,9 @@ private void OnMainWindowLoaded(object sender, RoutedEventArgs e)`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`Trace.WriteLine("");`
	`110`	`+`
	`111`	`+ m_filelist.SelectedIndex = 0;`
	`112`	`+ tabPages.SelectedIndex = 0;`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`private void OnMainWindowClosing(object sender, System.ComponentModel.CancelEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Diagnostics;`
`3`	`4`
`4`	`5`	`namespace DotNetProjects.SVGImage.SVG.FileLoaders`
`5`	`6`	`{`
`@@ -22,6 +23,9 @@ public Stream LoadFile(string hRef, string svgFilename)`
`22`	`23`	`string filename = Path.Combine(path, hRef);`
`23`	`24`	`if (File.Exists(filename))`
`24`	`25`	`return File.OpenRead(filename);`
	`26`	`+`
	`27`	`+ Trace.TraceWarning("Unresolved URI: " + hRef);`
	`28`	`+`
`25`	`29`	`return null;`
`26`	`30`	`}`
`27`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public GradientColorPaintServer(PaintServerManager owner, XmlNode node) : base(o`
`28`	`28`	`{`
`29`	`29`	`string refid = XmlUtil.AttrValue(node, "xlink:href", string.Empty);`
`30`	`30`	`string paintServerKey = owner.Parse(refid.Substring(1));`
`31`		`- GradientColorPaintServer refcol = owner.GetServers()[paintServerKey] as GradientColorPaintServer;`
	`31`	`+ GradientColorPaintServer refcol = owner.GetServer(paintServerKey) as GradientColorPaintServer;`
`32`	`32`	`if (refcol == null) return;`
`33`	`33`	`this.m_stops = new List<GradientStop>(refcol.m_stops);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-using System.Windows;`
	`1`	`+using System.Xml;`
	`2`	`+`
	`3`	`+using System.Windows;`
`2`	`4`	`using System.Windows.Media;`
`3`		`-using System.Xml;`
`4`	`5`
`5`	`6`	`namespace SVGImage.SVG.PaintServer`
`6`	`7`	`{`
`@@ -28,6 +29,7 @@ public LinearGradientColorPaintServerPaintServer(PaintServerManager owner, Brush`
`28`	`29`	`{`
`29`	`30`	`Brush = newBrush;`
`30`	`31`	`}`
	`32`	`+`
`31`	`33`	`public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rect bounds)`
`32`	`34`	`{`
`33`	`35`	`if (this.Brush != null) return this.Brush;`
`@@ -36,30 +38,30 @@ public override Brush GetBrush(double opacity, SVG svg, SVGRender svgRender, Rec`
`36`	`38`	`foreach (GradientStop stop in this.Stops) b.GradientStops.Add(stop);`
`37`	`39`
`38`	`40`	`b.MappingMode = BrushMappingMode.RelativeToBoundingBox;`
`39`		`- b.StartPoint = new System.Windows.Point(0, 0);`
`40`		`- b.EndPoint = new System.Windows.Point(1, 0);`
	`41`	`+ b.StartPoint = new Point(0, 0);`
	`42`	`+ b.EndPoint = new Point(1, 0);`
`41`	`43`
`42`	`44`	`if (this.GradientUnits == SVGTags.sUserSpaceOnUse)`
`43`	`45`	`{`
`44`	`46`	`Transform tr = this.Transform as Transform;`
`45`	`47`	`if (tr != null)`
`46`	`48`	`{`
`47`		`- b.StartPoint = tr.Transform(new System.Windows.Point(this.X1, this.Y1));`
`48`		`- b.EndPoint = tr.Transform(new System.Windows.Point(this.X2, this.Y2));`
	`49`	`+ b.StartPoint = tr.Transform(new Point(this.X1, this.Y1));`
	`50`	`+ b.EndPoint = tr.Transform(new Point(this.X2, this.Y2));`
`49`	`51`	`}`
`50`	`52`	`else`
`51`	`53`	`{`
`52`		`- b.StartPoint = new System.Windows.Point(this.X1, this.Y1);`
`53`		`- b.EndPoint = new System.Windows.Point(this.X2, this.Y2);`
	`54`	`+ b.StartPoint = new Point(this.X1, this.Y1);`
	`55`	`+ b.EndPoint = new Point(this.X2, this.Y2);`
`54`	`56`	`}`
`55`	`57`	`this.Transform = null;`
`56`	`58`	`b.MappingMode = BrushMappingMode.Absolute;`
`57`	`59`	`}`
`58`	`60`	`else`
`59`	`61`	`{`
`60`	`62`	`this.Normalize();`
`61`		`- if (double.IsNaN(this.X1) == false) b.StartPoint = new System.Windows.Point(this.X1, this.Y1);`
`62`		`- if (double.IsNaN(this.X2) == false) b.EndPoint = new System.Windows.Point(this.X2, this.Y2);`
	`63`	`+ if (double.IsNaN(this.X1) == false) b.StartPoint = new Point(this.X1, this.Y1);`
	`64`	`+ if (double.IsNaN(this.X2) == false) b.EndPoint = new Point(this.X2, this.Y2);`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`this.Brush = b;`
Original file line number	Diff line number	Diff line change
`@@ -22,33 +22,44 @@ public class ImageShape : Shape`
`22`	`22`
`23`	`23`	`public ImageShape(SVG svg, XmlNode node) : base(svg, node)`
`24`	`24`	`{`
`25`		`- this.X = XmlUtil.AttrValue(node, "x", 0, svg.Size.Width);`
`26`		`- this.Y = XmlUtil.AttrValue(node, "y", 0, svg.Size.Height);`
`27`		`- this.Width = XmlUtil.AttrValue(node, "width", 0, svg.Size.Width);`
	`25`	`+ this.X = XmlUtil.AttrValue(node, "x", 0, svg.Size.Width);`
	`26`	`+ this.Y = XmlUtil.AttrValue(node, "y", 0, svg.Size.Height);`
	`27`	`+ this.Width = XmlUtil.AttrValue(node, "width", 0, svg.Size.Width);`
`28`	`28`	`this.Height = XmlUtil.AttrValue(node, "height", 0, svg.Size.Height);`
`29`	`29`	`string hRef = XmlUtil.AttrValue(node, "xlink:href", string.Empty);`
`30`	`30`	`if (hRef.Length > 0)`
`31`	`31`	`{`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- BitmapImage b = new BitmapImage();`
`35`		`- b.BeginInit();`
`36`		`- if (hRef.StartsWith("data:image/png;base64"))`
	`34`	`+ Stream imageStream = null;`
	`35`	`+ if (hRef.StartsWith("data:image/png;base64", StringComparison.OrdinalIgnoreCase))`
`37`	`36`	`{`
`38`		`- b.StreamSource = new MemoryStream(Convert.FromBase64String(hRef.Substring("data:image/png;base64,".Length)));`
	`37`	`+ var embeddedImage = hRef.Substring("data:image/png;base64,".Length);`
	`38`	`+ if (!string.IsNullOrWhiteSpace(embeddedImage))`
	`39`	`+ {`
	`40`	`+ imageStream = new MemoryStream(Convert.FromBase64String(embeddedImage));`
	`41`	`+ }`
`39`	`42`	`}`
`40`	`43`	`else`
`41`	`44`	`{`
`42`	`45`	`if (svg.ExternalFileLoader != null)`
`43`		`- b.StreamSource = svg.ExternalFileLoader.LoadFile(hRef, svg.Filename);`
	`46`	`+ {`
	`47`	`+ imageStream = svg.ExternalFileLoader.LoadFile(hRef, svg.Filename);`
	`48`	`+ }`
`44`	`49`	`}`
	`50`	`+ if (imageStream != null)`
	`51`	`+ {`
	`52`	`+ BitmapImage b = new BitmapImage();`
	`53`	`+ b.BeginInit();`
	`54`	`+ b.StreamSource = imageStream;`
	`55`	`+ b.EndInit();`
`45`	`56`
`46`		`- b.EndInit();`
`47`		`- this.ImageSource = b;`
	`57`	`+ this.ImageSource = b;`
	`58`	`+ }`
`48`	`59`	`}`
`49`	`60`	`catch (Exception ex)`
`50`	`61`	`{`
`51`		`- Trace.TraceError(ex.Message);`
	`62`	`+ Trace.TraceError(ex.ToString());`
`52`	`63`	`}`
`53`	`64`	`}`
`54`	`65`	`}`