Update to 3.5.2 and .net core 2.1

This commit is contained in:
stefan
2018-09-12 19:26:21 +02:00
parent c32d865638
commit 48facb797e
1419 changed files with 27525 additions and 88927 deletions

View File

@@ -138,7 +138,7 @@ namespace Emby.Drawing.ImageMagick
// Even if the caller specified 100, don't use it because it takes forever
quality = Math.Min(quality, 99);
if (string.IsNullOrWhiteSpace(options.BackgroundColor) || !HasTransparency(inputPath))
if (string.IsNullOrEmpty(options.BackgroundColor) || !HasTransparency(inputPath))
{
using (var originalImage = new MagickWand(inputPath))
{
@@ -216,7 +216,7 @@ namespace Emby.Drawing.ImageMagick
private void AddForegroundLayer(MagickWand wand, ImageProcessingOptions options)
{
if (string.IsNullOrWhiteSpace(options.ForegroundLayer))
if (string.IsNullOrEmpty(options.ForegroundLayer))
{
return;
}
@@ -328,7 +328,6 @@ namespace Emby.Drawing.ImageMagick
{
_disposed = true;
Wand.CloseEnvironment();
GC.SuppressFinalize(this);
}
private void CheckDisposed()