Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:11:24 +02:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-12 14:30:14 -05:00
parent f6d74d9a0e
commit aab0cea39a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
View file

@ -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);
}

4
SharedVersion.cs
View file

@ -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")]