GetDimensionsFromSvg() should also consider viewBox attribute

muratcakir · muratcakir · commit 0370dff87560 · 2019-09-27T04:28:09.000+02:00
diff --git a/src/Libraries/SmartStore.Core/IO/ImageHeader.cs b/src/Libraries/SmartStore.Core/IO/ImageHeader.cs
@@ -29,7 +29,7 @@ public UnknownImageFormatException(string paramName = "", Exception e = null)
 			{ new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif },
 			{ new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif },
 			{ new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng },
-   //         { new byte[] { 0xff, 0xd8 }, DecodeJfif },
+            //{ new byte[] { 0xff, 0xd8 }, DecodeJfif },
 			//{ new byte[] { 0xff, 0xd8, 0xff, 0xe0 }, DecodeJpeg },
 			//{ new byte[] { 0xff }, DecodeJpeg2 },
 		};
@@ -193,7 +193,21 @@ private static Size GetDimensionsFromSvg(Stream input)
                             var width = reader["width"];
                             var height = reader["height"];
 
-                            return new Size(width.ToInt(), height.ToInt());
+                            var size = new Size(width.ToInt(), height.ToInt());
+                            if (size.Width == 0 || size.Height == 0)
+                            {
+                                var viewBox = reader["viewBox"];
+                                if (viewBox.HasValue())
+                                {
+                                    var arrViewBox = viewBox.Trim().Split(' ');
+                                    if (arrViewBox.Length == 4)
+                                    {
+                                        size = new Size(arrViewBox[2].ToInt(), arrViewBox[3].ToInt());
+                                    }
+                                }
+                            }
+
+                            return size;
                         }
                     }
                 }
diff --git a/src/Libraries/SmartStore.Services/Media/MediaHelper.cs b/src/Libraries/SmartStore.Services/Media/MediaHelper.cs
diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
@@ -323,7 +323,7 @@
     <Compile Include="Media\Storage\DatabaseMediaStorageProvider.cs" />
     <Compile Include="Media\Storage\FileSystemMediaStorageProvider.cs" />
     <Compile Include="Media\Storage\IMediaStorageProvider.cs" />
-    <Compile Include="Media\MediaExtensions.cs" />
+    <Compile Include="Media\MediaHelper.cs" />
     <Compile Include="Media\Storage\IMediaMover.cs" />
     <Compile Include="Media\Storage\ISupportsMediaMoving.cs" />
     <Compile Include="Media\Storage\MediaMoverContext.cs" />
