Added MediaTypes.Icon (image/x-icon) as a supported content-type for …

…the BitmapHttpContentConverter and BitmapSourceHttpContentConverter, this adds support for loading icon files. [release]
dapplo · Sep 5, 2016 · c1f703c · c1f703c
1 parent 6d8799c
commit c1f703c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Dapplo.HttpExtensions.SharedDesktop/ContentConverter/BitmapHttpContentConverter.cs b/Dapplo.HttpExtensions.SharedDesktop/ContentConverter/BitmapHttpContentConverter.cs
@@ -60,6 +60,7 @@ static BitmapHttpContentConverter()
 			SupportedContentTypes.Add(MediaTypes.Jpeg.EnumValueOf());
 			SupportedContentTypes.Add(MediaTypes.Png.EnumValueOf());
 			SupportedContentTypes.Add(MediaTypes.Tiff.EnumValueOf());
+			SupportedContentTypes.Add(MediaTypes.Icon.EnumValueOf());
 		}
 		/// <summary>
 		/// Constructor
@@ -141,7 +142,10 @@ public bool CanConvertToHttpContent(Type typeToConvert, object content)
 		/// <inheritdoc />
 		public HttpContent ConvertToHttpContent(Type typeToConvert, object content)
 		{
-			if (!CanConvertToHttpContent(typeToConvert, content)) return null;
+			if (!CanConvertToHttpContent(typeToConvert, content))
+			{
+				return null;
+			}
 
 			var bitmap = content as Bitmap;
 			if (bitmap == null) return null;

diff --git a/Dapplo.HttpExtensions.SharedDesktop/ContentConverter/BitmapSourceHttpContentConverter.cs b/Dapplo.HttpExtensions.SharedDesktop/ContentConverter/BitmapSourceHttpContentConverter.cs
@@ -57,6 +57,7 @@ static BitmapSourceHttpContentConverter()
 			SupportedContentTypes.Add(MediaTypes.Jpeg.EnumValueOf());
 			SupportedContentTypes.Add(MediaTypes.Png.EnumValueOf());
 			SupportedContentTypes.Add(MediaTypes.Tiff.EnumValueOf());
+			SupportedContentTypes.Add(MediaTypes.Icon.EnumValueOf());
 		}
 
 		/// <summary>