Change to visualizer target to more narrow type BitmapSource instead of broader type ImageSource

Author: aberus

src/ImageVisualizer14/ImageVisualizer.cs

@@ -16,17 +16,17 @@
     Target = typeof(System.Drawing.Bitmap), 
     Description = "Image Visualizer")]
 
-// System.Windows.Media.ImageSource, System.Windows.Media.Imaging.BitmapImage, System.Windows.Media.Imaging.BitmapSource
+// System.Windows.Media.Imaging.BitmapImage, System.Windows.Media.Imaging.BitmapSource
 [assembly: System.Diagnostics.DebuggerVisualizer(
     typeof(ImageVisualizer), 
     typeof(ImageVisualizerObjectSource), 
-    Target = typeof(System.Windows.Media.ImageSource), 
+    Target = typeof(System.Windows.Media.Imaging.BitmapSource), 
     Description = "Image Visualizer")]
 
 namespace Aberus.VisualStudio.Debugger.ImageVisualizer
 {
     /// <summary>
-    /// A Visualizer for <see cref="System.Windows.Media.ImageSource"/> and <see cref="System.Drawing.Bitmap"/>.
+    /// A Visualizer for <see cref="System.Windows.Media.Imaging.BitmapSource"/> and <see cref="System.Drawing.Bitmap"/>.
     /// </summary>
     public class ImageVisualizer : DialogDebuggerVisualizer
     {

src/ImageVisualizer14/ImageVisualizerObjectSource.cs

@@ -9,8 +9,8 @@ public class ImageVisualizerObjectSource : VisualizerObjectSource
     {
         public override void GetData(object target, Stream outgoingData)
         {
-            if (target is ImageSource image)
-                base.GetData(new SerializableBitmapImage((BitmapSource)image), outgoingData);
+            if (target is BitmapSource image)
+                base.GetData(new SerializableBitmapImage(image), outgoingData);
             else
                 base.GetData(target, outgoingData);
         }

src/ImageVisualizer14/SerializableBitmapImage.cs

@@ -12,11 +12,9 @@ public class SerializableBitmapImage : ISerializable
         public BitmapSource bitmapSource;
         private readonly string expression;
 
-        public BitmapImage Image { get; private set; }
-
         public SerializableBitmapImage(BitmapImage image)
         {
-            this.Image = image;
+            bitmapSource = image;
         }
 
         public SerializableBitmapImage(BitmapSource source)
@@ -37,12 +35,14 @@ protected SerializableBitmapImage(SerializationInfo info, StreamingContext conte
                             var stream = new MemoryStream(array);
                             stream.Seek(0, SeekOrigin.Begin);
 
-                            Image = new BitmapImage();
-                            Image.CacheOption = BitmapCacheOption.OnLoad;
-                            Image.BeginInit();
-                            Image.StreamSource = stream;
-                            Image.EndInit();
-                            Image.Freeze();
+                            var bitmapImage = new BitmapImage();
+                            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                            bitmapImage.BeginInit();
+                            bitmapImage.StreamSource = stream;
+                            bitmapImage.EndInit();
+                            bitmapImage.Freeze();
+
+                            bitmapSource = bitmapImage;
                         }
                     }
                     catch (ExternalException)
@@ -78,28 +78,26 @@ public static implicit operator SerializableBitmapImage(BitmapImage bitmapImage)
 
         public static implicit operator BitmapImage(SerializableBitmapImage serializableBitmapImage)
         {
-            return serializableBitmapImage.Image;
+            return (BitmapImage)serializableBitmapImage.bitmapSource;
         }
 
         //[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
         void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
         {
-            var source = Image ?? bitmapSource;
-
-            if (source != null)
+            if (bitmapSource != null)
             {
                 using (var memoryStream = new MemoryStream())
                 {
                     var encoder = new PngBitmapEncoder();
                     //TODO try/catch
-                    encoder.Frames.Add(BitmapFrame.Create(source)); 
+                    encoder.Frames.Add(BitmapFrame.Create(bitmapSource)); 
                     encoder.Save(memoryStream);
                     memoryStream.Seek(0, SeekOrigin.Begin);
 
                     info.AddValue("Image", memoryStream.ToArray(), typeof(byte[]));
                 }
 
-                info.AddValue("Name", source.ToString());
+                info.AddValue("Name", bitmapSource.ToString());
             }
         }