diff --git a/Emby.Drawing/Common/ImageHeader.cs b/Emby.Drawing/Common/ImageHeader.cs
new file mode 100644
index 000000000..59df5c04f
--- /dev/null
+++ b/Emby.Drawing/Common/ImageHeader.cs
@@ -0,0 +1,223 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Emby.Drawing.Common
+{
+ ///
+ /// Taken from http://stackoverflow.com/questions/111345/getting-image-dimensions-without-reading-the-entire-file/111349
+ /// http://www.codeproject.com/Articles/35978/Reading-Image-Headers-to-Get-Width-and-Height
+ /// Minor improvements including supporting unsigned 16-bit integers when decoding Jfif and added logic
+ /// to load the image using new Bitmap if reading the headers fails
+ ///
+ public static class ImageHeader
+ {
+ ///
+ /// The error message
+ ///
+ const string ErrorMessage = "Could not recognize image format.";
+
+ ///
+ /// The image format decoders
+ ///
+ private static readonly KeyValuePair>[] ImageFormatDecoders = new Dictionary>
+ {
+ { new byte[] { 0x42, 0x4D }, DecodeBitmap },
+ { 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 }
+
+ }.ToArray();
+
+ private static readonly int MaxMagicBytesLength = ImageFormatDecoders.Select(i => i.Key.Length).OrderByDescending(i => i).First();
+
+ ///
+ /// Gets the dimensions of an image.
+ ///
+ /// The path of the image to get the dimensions of.
+ /// The logger.
+ /// The file system.
+ /// The dimensions of the specified image.
+ /// The image was of an unrecognised format.
+ public static ImageSize GetDimensions(string path, ILogger logger, IFileSystem fileSystem)
+ {
+ using (var fs = File.OpenRead(path))
+ {
+ using (var binaryReader = new BinaryReader(fs))
+ {
+ return GetDimensions(binaryReader);
+ }
+ }
+ }
+
+ ///
+ /// Gets the dimensions of an image.
+ ///
+ /// The binary reader.
+ /// Size.
+ /// binaryReader
+ /// The image was of an unrecognized format.
+ private static ImageSize GetDimensions(BinaryReader binaryReader)
+ {
+ var magicBytes = new byte[MaxMagicBytesLength];
+
+ for (var i = 0; i < MaxMagicBytesLength; i += 1)
+ {
+ magicBytes[i] = binaryReader.ReadByte();
+
+ foreach (var kvPair in ImageFormatDecoders)
+ {
+ if (StartsWith(magicBytes, kvPair.Key))
+ {
+ return kvPair.Value(binaryReader);
+ }
+ }
+ }
+
+ throw new ArgumentException(ErrorMessage, "binaryReader");
+ }
+
+ ///
+ /// Startses the with.
+ ///
+ /// The this bytes.
+ /// The that bytes.
+ /// true if XXXX, false otherwise
+ private static bool StartsWith(byte[] thisBytes, byte[] thatBytes)
+ {
+ for (int i = 0; i < thatBytes.Length; i += 1)
+ {
+ if (thisBytes[i] != thatBytes[i])
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ ///
+ /// Reads the little endian int16.
+ ///
+ /// The binary reader.
+ /// System.Int16.
+ private static short ReadLittleEndianInt16(BinaryReader binaryReader)
+ {
+ var bytes = new byte[sizeof(short)];
+
+ for (int i = 0; i < sizeof(short); i += 1)
+ {
+ bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte();
+ }
+ return BitConverter.ToInt16(bytes, 0);
+ }
+
+ ///
+ /// Reads the little endian int32.
+ ///
+ /// The binary reader.
+ /// System.Int32.
+ private static int ReadLittleEndianInt32(BinaryReader binaryReader)
+ {
+ var bytes = new byte[sizeof(int)];
+ for (int i = 0; i < sizeof(int); i += 1)
+ {
+ bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte();
+ }
+ return BitConverter.ToInt32(bytes, 0);
+ }
+
+ ///
+ /// Decodes the bitmap.
+ ///
+ /// The binary reader.
+ /// Size.
+ private static ImageSize DecodeBitmap(BinaryReader binaryReader)
+ {
+ binaryReader.ReadBytes(16);
+ int width = binaryReader.ReadInt32();
+ int height = binaryReader.ReadInt32();
+ return new ImageSize
+ {
+ Width = width,
+ Height = height
+ };
+ }
+
+ ///
+ /// Decodes the GIF.
+ ///
+ /// The binary reader.
+ /// Size.
+ private static ImageSize DecodeGif(BinaryReader binaryReader)
+ {
+ int width = binaryReader.ReadInt16();
+ int height = binaryReader.ReadInt16();
+ return new ImageSize
+ {
+ Width = width,
+ Height = height
+ };
+ }
+
+ ///
+ /// Decodes the PNG.
+ ///
+ /// The binary reader.
+ /// Size.
+ private static ImageSize DecodePng(BinaryReader binaryReader)
+ {
+ binaryReader.ReadBytes(8);
+ int width = ReadLittleEndianInt32(binaryReader);
+ int height = ReadLittleEndianInt32(binaryReader);
+ return new ImageSize
+ {
+ Width = width,
+ Height = height
+ };
+ }
+
+ ///
+ /// Decodes the jfif.
+ ///
+ /// The binary reader.
+ /// Size.
+ ///
+ private static ImageSize DecodeJfif(BinaryReader binaryReader)
+ {
+ while (binaryReader.ReadByte() == 0xff)
+ {
+ byte marker = binaryReader.ReadByte();
+ short chunkLength = ReadLittleEndianInt16(binaryReader);
+ if (marker == 0xc0)
+ {
+ binaryReader.ReadByte();
+ int height = ReadLittleEndianInt16(binaryReader);
+ int width = ReadLittleEndianInt16(binaryReader);
+ return new ImageSize
+ {
+ Width = width,
+ Height = height
+ };
+ }
+
+ if (chunkLength < 0)
+ {
+ var uchunkLength = (ushort)chunkLength;
+ binaryReader.ReadBytes(uchunkLength - 2);
+ }
+ else
+ {
+ binaryReader.ReadBytes(chunkLength - 2);
+ }
+ }
+
+ throw new ArgumentException(ErrorMessage);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
index cbc996659..800756ee9 100644
--- a/Emby.Drawing/Emby.Drawing.csproj
+++ b/Emby.Drawing/Emby.Drawing.csproj
@@ -55,6 +55,7 @@
Properties\SharedVersion.cs
+
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 3faa3e3e9..471037801 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -16,6 +16,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Emby.Drawing.Common;
namespace Emby.Drawing
{
@@ -414,18 +415,26 @@ namespace Emby.Drawing
/// ImageSize.
private ImageSize GetImageSizeInternal(string path, bool allowSlowMethod)
{
- using (var file = TagLib.File.Create(path))
+ try
{
- var image = file as TagLib.Image.File;
-
- var properties = image.Properties;
-
- return new ImageSize
+ using (var file = TagLib.File.Create(path))
{
- Height = properties.PhotoHeight,
- Width = properties.PhotoWidth
- };
+ var image = file as TagLib.Image.File;
+
+ var properties = image.Properties;
+
+ return new ImageSize
+ {
+ Height = properties.PhotoHeight,
+ Width = properties.PhotoWidth
+ };
+ }
}
+ catch
+ {
+ }
+
+ return ImageHeader.GetDimensions(path, _logger, _fileSystem);
}
private readonly Timer _saveImageSizeTimer;
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 1d2a1de95..ccac9d8d8 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -182,6 +182,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest