Merge pull request #1997 from EPPlusSoftware/bug/issue1982

Fixes issue #1982.

Author: OssianEPPlus

src/EPPlus/Drawing/ExcelPicture.cs

@@ -22,6 +22,8 @@ Date               Author                       Change
 using System.Globalization;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.MathFunctions;
 using System.ComponentModel;
+using System.Xml.Linq;
+
 
 #if NETFULL
 using System.Drawing.Imaging;
@@ -93,6 +95,16 @@ internal ExcelPicture(ExcelDrawings drawings, XmlNode node, ExcelGroupShape shap
                     Image.Type = type.Value;
                     byte[] iby = ms.ToArray();
                     Image.ImageBytes = iby;
+                    using (var picMs = new MemoryStream(iby))
+                    {
+                        if (drawings._package.Settings.ImageSettings.GetImageBounds(picMs, type.Value, out double width, out double height, out double horizontalResolution, out double verticalResolution))
+                        {
+                            Image.Bounds.Width = width;
+                            Image.Bounds.Height = height;
+                            Image.Bounds.HorizontalResolution = horizontalResolution;
+                            Image.Bounds.VerticalResolution = verticalResolution;
+                        }
+                    }
                     var ii = _drawings._package.PictureStore.LoadImage(iby, container.UriPic, Part);
                     var pd = (IPictureRelationDocument)_drawings;
                     if (pd.Hashes.ContainsKey(ii.Hash))

src/EPPlus/Drawing/ImageHandling/GenericImageHandler.cs

@@ -26,7 +26,7 @@ public HashSet<ePictureType> SupportedTypes
         public Exception LastException { get; private set; } = null;
 
         /// <summary>
-        /// Retreives the image bounds and resolution for an image
+        /// Retrieves the image bounds and resolution for an image
         /// </summary>
         /// <param name="image">The image data</param>
         /// <param name="type">Type type of image</param>
@@ -42,7 +42,16 @@ public bool GetImageBounds(MemoryStream image, ePictureType type, out double wid
             {
                 width = 0;
                 height = 0;
-                return ImageReader.TryGetImageBounds(type, image, ref width, ref height, out horizontalResolution, out verticalResolution);
+                var ret = ImageReader.TryGetImageBounds(type, image, ref width, ref height, out horizontalResolution, out verticalResolution);
+                if (ret == false)
+                {
+                    var t = ImageReader.GetPictureType(image, false);
+                    if (t.HasValue)
+                    {
+                        return ImageReader.TryGetImageBounds(t.Value, image, ref width, ref height, out horizontalResolution, out verticalResolution);
+                    }
+                }
+                return ret;
             }
             catch (Exception ex)
             {
@@ -56,7 +65,7 @@ public bool GetImageBounds(MemoryStream image, ePictureType type, out double wid
         }
 
         /// <summary>
-        /// Returns if the handler is valid for the enviornment. 
+        /// Returns if the handler is valid for the environment. 
         /// The generic image handler is valid in all environments, so it will always return true.
         /// </summary>
         /// <returns></returns>