diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-10 15:15:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 15:15:14 -0400 |
| commit | 6ee9da3717a563d110fc56c93478885d19449cce (patch) | |
| tree | f353dec0ac06811918b33f6deed4e7fbe3c27935 /MediaBrowser.ServerApplication | |
| parent | 06a1393abed20137844f062e44cf8ae7feb9e8f6 (diff) | |
| parent | b9baf377e81e454438d9faad1b1b793a719bb667 (diff) | |
Merge pull request #2628 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/ImageEncoderHelper.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs index ddbde2f66..99ccdbbe8 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 a05438290..d632007d2 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -191,9 +191,11 @@ <ItemGroup> <Content Include="..\packages\SkiaSharp.1.57.1\runtimes\win7-x64\native\libSkiaSharp.dll"> <Link>x64\libSkiaSharp.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="..\packages\SkiaSharp.1.57.1\runtimes\win7-x86\native\libSkiaSharp.dll"> <Link>x86\libSkiaSharp.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="..\Tools\Installation\MediaBrowser.InstallUtil.dll"> <Link>MediaBrowser.InstallUtil.dll</Link> @@ -1110,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> |