|
@@ -90,7 +90,7 @@ namespace Emby.Drawing.ImageMagick
|
|
wand.SaveImage(tmpPath);
|
|
wand.SaveImage(tmpPath);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- catch
|
|
|
|
|
|
+ catch
|
|
{
|
|
{
|
|
//_logger.ErrorException("Error loading webp: ", ex);
|
|
//_logger.ErrorException("Error loading webp: ", ex);
|
|
_webpAvailable = false;
|
|
_webpAvailable = false;
|
|
@@ -148,7 +148,7 @@ namespace Emby.Drawing.ImageMagick
|
|
DrawIndicator(originalImage, width, height, options);
|
|
DrawIndicator(originalImage, width, height, options);
|
|
|
|
|
|
originalImage.CurrentImage.CompressionQuality = quality;
|
|
originalImage.CurrentImage.CompressionQuality = quality;
|
|
- originalImage.CurrentImage.StripImage();
|
|
|
|
|
|
+ //originalImage.CurrentImage.StripImage();
|
|
|
|
|
|
originalImage.SaveImage(outputPath);
|
|
originalImage.SaveImage(outputPath);
|
|
}
|
|
}
|
|
@@ -165,7 +165,7 @@ namespace Emby.Drawing.ImageMagick
|
|
DrawIndicator(wand, width, height, options);
|
|
DrawIndicator(wand, width, height, options);
|
|
|
|
|
|
wand.CurrentImage.CompressionQuality = quality;
|
|
wand.CurrentImage.CompressionQuality = quality;
|
|
- wand.CurrentImage.StripImage();
|
|
|
|
|
|
+ //wand.CurrentImage.StripImage();
|
|
|
|
|
|
wand.SaveImage(outputPath);
|
|
wand.SaveImage(outputPath);
|
|
}
|
|
}
|
|
@@ -176,14 +176,15 @@ namespace Emby.Drawing.ImageMagick
|
|
|
|
|
|
private void ScaleImage(MagickWand wand, int width, int height)
|
|
private void ScaleImage(MagickWand wand, int width, int height)
|
|
{
|
|
{
|
|
- if (_config.Configuration.EnableHighQualityImageScaling)
|
|
|
|
- {
|
|
|
|
- wand.CurrentImage.ResizeImage(width, height);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- wand.CurrentImage.ScaleImage(width, height);
|
|
|
|
- }
|
|
|
|
|
|
+ wand.CurrentImage.ResizeImage(width, height);
|
|
|
|
+ //if (_config.Configuration.EnableHighQualityImageScaling)
|
|
|
|
+ //{
|
|
|
|
+ // wand.CurrentImage.ResizeImage(width, height);
|
|
|
|
+ //}
|
|
|
|
+ //else
|
|
|
|
+ //{
|
|
|
|
+ // wand.CurrentImage.ScaleImage(width, height);
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -251,8 +252,8 @@ namespace Emby.Drawing.ImageMagick
|
|
private void SaveDelay()
|
|
private void SaveDelay()
|
|
{
|
|
{
|
|
// For some reason the images are not always getting released right away
|
|
// For some reason the images are not always getting released right away
|
|
- var task = Task.Delay(300);
|
|
|
|
- Task.WaitAll(task);
|
|
|
|
|
|
+ //var task = Task.Delay(300);
|
|
|
|
+ //Task.WaitAll(task);
|
|
}
|
|
}
|
|
|
|
|
|
public string Name
|
|
public string Name
|