Fix processing ICO type resources (#157)

Author: TerryFogg

MetadataProcessor.Shared/Tables/nanoResourcesTable.cs

@@ -9,6 +9,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Resources;
@@ -173,18 +174,43 @@ private static ResourceKind GetResourceKind(
             }
 
             // Check if the data is a bitmap, failure just means it is not.
+            // First 4 bytes of the resource data is the length
+            byte[] subset = new byte[resourceData.Length - 4];
+            Array.Copy(resourceData, 4, subset, 0, subset.Length);
+            MemoryStream ms = new MemoryStream(subset);
+
             try
             {
-                byte[] subset = new byte[resourceData.Length - 4];
-                Array.Copy(resourceData, 4,subset, 0,subset.Length);
-                MemoryStream ms = new MemoryStream(subset);
-
-                Bitmap bitmapImage = Image.FromStream(ms) as Bitmap;
-                return ResourceKind.Bitmap;
+                // Check for supported bitmap type
+                Image img = Image.FromStream(ms);
+                if (Guid.Equals(img.RawFormat,ImageFormat.Bmp))
+                {
+                    return ResourceKind.Bitmap;
+                }
+                else if (Guid.Equals(img.RawFormat, ImageFormat.Jpeg))
+                {
+                    return ResourceKind.Bitmap;
+                }
+                else if (Guid.Equals(img.RawFormat, ImageFormat.Gif))
+                {
+                    return ResourceKind.Bitmap;
+                }
+                else if (Guid.Equals(img.RawFormat,ImageFormat.Icon)
+                      || Guid.Equals(img.RawFormat,ImageFormat.Emf)
+                      || Guid.Equals(img.RawFormat,ImageFormat.Exif)
+                      || Guid.Equals(img.RawFormat,ImageFormat.MemoryBmp)
+                      || Guid.Equals(img.RawFormat,ImageFormat.Png)
+                      || Guid.Equals(img.RawFormat,ImageFormat.Tiff)
+                      || Guid.Equals(img.RawFormat, ImageFormat.Wmf) )
+                {
+                    // Any future support for other image types to be handled here
+                    // Currently, fall through and pass data as a byte array
+                }
             }
             catch
             {
-                // Ignore error if not a bitmap
+                // Not an error
+                // The data is not an image, fall through and treat as a binary array
             }
 
             // None of the above, assume binary