aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-09 16:18:02 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-09 16:18:02 -0400
commit4569b6b49196eeb0c13003bfce087e2258dcc33e (patch)
tree4a923bc5f13d6193a2a12b9c682d6ae0e95062d4 /MediaBrowser.ServerApplication/ImageEncoderHelper.cs
parent34c3783f42d643f2dcc2e93d8f0b5e07580c21c1 (diff)
update images
Diffstat (limited to 'MediaBrowser.ServerApplication/ImageEncoderHelper.cs')
-rw-r--r--MediaBrowser.ServerApplication/ImageEncoderHelper.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
index ddbde2f66..8c3d8d213 100644
--- a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
+++ b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
@@ -2,6 +2,7 @@
using Emby.Drawing;
using Emby.Drawing.Net;
using Emby.Drawing.ImageMagick;
+using Emby.Drawing.Skia;
using Emby.Server.Core;
using Emby.Server.Implementations;
using MediaBrowser.Common.Configuration;
@@ -25,6 +26,15 @@ namespace MediaBrowser.Server.Startup.Common
{
try
{
+ return new SkiaEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
+ }
+ catch
+ {
+ logger.Error("Error loading ImageMagick. Will revert to GDI.");
+ }
+
+ try
+ {
return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
}
catch