Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

MediaBrowser · Jan 12, 2016 · 1726433 · 1726433
2 parents ddf147a + 7161956
commit 1726433
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 185 deletions.
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
@@ -181,7 +181,9 @@ public void EncodeImage(string inputPath, string outputPath, int width, int heig
 
         private void ScaleImage(MagickWand wand, int width, int height)
         {
-            if (_config.Configuration.EnableHighQualityImageScaling)
+            var highQuality = false;
+
+            if (highQuality)
             {
                 wand.CurrentImage.ResizeImage(width, height);
             }