Fixed ImageShape rendering

- Correctly handle unresolved resources.
- Issue: Tests/Images/example4.8.svg
- Added missing image file: CodeProjectLogo.jpg
- All exceptions in /Test/Images are now resolved. Three files are still not rendered.

Author: paulushub

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)

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;
         }
     }

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());
                 }
             }
         }