diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-09 16:18:02 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-09 16:18:02 -0400 |
| commit | 4569b6b49196eeb0c13003bfce087e2258dcc33e (patch) | |
| tree | 4a923bc5f13d6193a2a12b9c682d6ae0e95062d4 /MediaBrowser.ServerApplication | |
| parent | 34c3783f42d643f2dcc2e93d8f0b5e07580c21c1 (diff) | |
update images
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/ImageEncoderHelper.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 4 |
2 files changed, 14 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 diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 7c3757f5f..d632007d2 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -1112,6 +1112,10 @@ <Project>{c97a239e-a96c-4d64-a844-ccf8cc30aecb}</Project> <Name>Emby.Drawing.Net</Name> </ProjectReference> + <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj"> + <Project>{2312da6d-ff86-4597-9777-bceec32d96dd}</Project> + <Name>Emby.Drawing.Skia</Name> + </ProjectReference> <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj"> <Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project> <Name>Emby.Drawing</Name> |