diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
| commit | 5d4682d4185c88332c460021c0ffea26361f291b (patch) | |
| tree | c50c075899778fb5e5caf6acbafe3cb95059adb8 /Emby.Drawing/ImageMagick | |
| parent | 2ed5c3d0e7f61534f7a01b8b200aff9115ddb444 (diff) | |
| parent | 50a16452a99ee5865082c73f2a4e063cb02f6e69 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'Emby.Drawing/ImageMagick')
| -rw-r--r-- | Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs index 64ddf7e88..5ca674888 100644 --- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs +++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs @@ -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,15 +176,14 @@ namespace Emby.Drawing.ImageMagick private void ScaleImage(MagickWand wand, int width, int height) { - wand.CurrentImage.ResizeImage(width, height); - //if (_config.Configuration.EnableHighQualityImageScaling) - //{ - // wand.CurrentImage.ResizeImage(width, height); - //} - //else - //{ - // wand.CurrentImage.ScaleImage(width, height); - //} + if (_config.Configuration.EnableHighQualityImageScaling) + { + wand.CurrentImage.ResizeImage(width, height); + } + else + { + wand.CurrentImage.ScaleImage(width, height); + } } /// <summary> |