aboutsummaryrefslogtreecommitdiff
path: root/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-26 01:29:32 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-26 01:29:32 -0400
commitc80e1df1ca1b5b2a082bf6a10e0c4c35d3a31f3b (patch)
treeb4decdfd240182061ab55299b12798b429f7a82d /Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
parent2890c71af92dcb6920c4ab7da48cd6807ca86703 (diff)
support null image encoder
Diffstat (limited to 'Emby.Drawing/ImageMagick/ImageMagickEncoder.cs')
-rw-r--r--Emby.Drawing/ImageMagick/ImageMagickEncoder.cs19
1 files changed, 14 insertions, 5 deletions
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
index e73184974..ed0760ee3 100644
--- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
@@ -9,7 +9,6 @@ using System;
using System.IO;
using System.Linq;
using CommonIO;
-using MediaBrowser.Common.IO;
namespace Emby.Drawing.ImageMagick
{
@@ -27,7 +26,7 @@ namespace Emby.Drawing.ImageMagick
_httpClient = httpClient;
_fileSystem = fileSystem;
- LogImageMagickVersion();
+ LogVersion();
}
public string[] SupportedInputFormats
@@ -68,7 +67,7 @@ namespace Emby.Drawing.ImageMagick
}
}
- private void LogImageMagickVersion()
+ private void LogVersion()
{
_logger.Info("ImageMagick version: " + Wand.VersionString);
TestWebp();
@@ -88,9 +87,9 @@ namespace Emby.Drawing.ImageMagick
wand.SaveImage(tmpPath);
}
}
- catch (Exception ex)
+ catch
{
- _logger.ErrorException("Error loading webp: ", ex);
+ //_logger.ErrorException("Error loading webp: ", ex);
_webpAvailable = false;
}
}
@@ -255,5 +254,15 @@ namespace Emby.Drawing.ImageMagick
throw new ObjectDisposedException(GetType().Name);
}
}
+
+ public bool SupportsImageCollageCreation
+ {
+ get { return true; }
+ }
+
+ public bool SupportsImageEncoding
+ {
+ get { return true; }
+ }
}
}