diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 14:30:14 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 14:30:14 -0500 |
| commit | aab0cea39a308fd68a2d256ab52a63c66934ed68 (patch) | |
| tree | a7fd3b1d63d714c0403a90310657bd961725b682 | |
| parent | f6d74d9a0e362e01c07dd3721dcea1e6efd0c5e5 (diff) | |
fix merge conflict
| -rw-r--r-- | Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs index 12a98edff..6858c6d52 100644 --- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs +++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs @@ -181,7 +181,9 @@ namespace Emby.Drawing.ImageMagick private void ScaleImage(MagickWand wand, int width, int height) { - if (_config.Configuration.EnableHighQualityImageScaling) + var highQuality = false; + + if (highQuality) { wand.CurrentImage.ResizeImage(width, height); } diff --git a/SharedVersion.cs b/SharedVersion.cs index 47d539745..749c65f73 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5802")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5806")] |