move image magick files

This commit is contained in:
Luke Pulverenti
2015-03-06 12:50:14 -05:00
parent 3788033dcd
commit 23a062103a
4 changed files with 88 additions and 83 deletions

View File

@@ -1,5 +1,4 @@
using ImageMagickSharp;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.IO;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Logging;
using System;
@@ -47,32 +46,13 @@ namespace MediaBrowser.Server.Implementations.Drawing
/// <exception cref="ArgumentException">The image was of an unrecognised format.</exception>
public static ImageSize GetDimensions(string path, ILogger logger, IFileSystem fileSystem)
{
try
using (var fs = File.OpenRead(path))
{
using (var fs = File.OpenRead(path))
using (var binaryReader = new BinaryReader(fs))
{
using (var binaryReader = new BinaryReader(fs))
{
return GetDimensions(binaryReader);
}
return GetDimensions(binaryReader);
}
}
catch
{
logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
}
using (var wand = new MagickWand())
{
wand.PingImage(path);
var img = wand.CurrentImage;
return new ImageSize
{
Width = img.Width,
Height = img.Height
};
}
}
/// <summary>