aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-12 14:27:14 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-12 14:27:14 -0500
commitccc7f5da7125465aebd485b0d5ddc5a0ea0df1c2 (patch)
treed80ea62565745b25071d99b1a4ca58177d61994b
parentde617dae9bf94431f2dbbdbd782263c7fa8e44af (diff)
update image magick encoder
-rw-r--r--Emby.Drawing/ImageMagick/ImageMagickEncoder.cs27
1 files changed, 14 insertions, 13 deletions
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
index d18ee1caa..64ddf7e88 100644
--- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
@@ -90,7 +90,7 @@ namespace Emby.Drawing.ImageMagick
wand.SaveImage(tmpPath);
}
}
- catch
+ catch
{
//_logger.ErrorException("Error loading webp: ", ex);
_webpAvailable = false;
@@ -148,7 +148,7 @@ namespace Emby.Drawing.ImageMagick
DrawIndicator(originalImage, width, height, options);
originalImage.CurrentImage.CompressionQuality = quality;
- originalImage.CurrentImage.StripImage();
+ //originalImage.CurrentImage.StripImage();
originalImage.SaveImage(outputPath);
}
@@ -165,7 +165,7 @@ namespace Emby.Drawing.ImageMagick
DrawIndicator(wand, width, height, options);
wand.CurrentImage.CompressionQuality = quality;
- wand.CurrentImage.StripImage();
+ //wand.CurrentImage.StripImage();
wand.SaveImage(outputPath);
}
@@ -176,14 +176,15 @@ namespace Emby.Drawing.ImageMagick
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>
@@ -251,8 +252,8 @@ namespace Emby.Drawing.ImageMagick
private void SaveDelay()
{
// 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