Merge pull request #2594 from MediaBrowser/dev

Dev

1 files changed, 0 insertions, 48 deletions

diff --git a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
deleted file mode 100644
index ddbde2f66..000000000
--- a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Emby.Drawing;
-using Emby.Drawing.Net;
-using Emby.Drawing.ImageMagick;
-using Emby.Server.Core;
-using Emby.Server.Implementations;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-
-namespace MediaBrowser.Server.Startup.Common
-{
-    public class ImageEncoderHelper
-    {
-        public static IImageEncoder GetImageEncoder(ILogger logger, 
-            ILogManager logManager, 
-            IFileSystem fileSystem, 
-            StartupOptions startupOptions, 
-            Func<IHttpClient> httpClient,
-            IApplicationPaths appPaths)
-        {
-            if (!startupOptions.ContainsOption("-enablegdi"))
-            {
-                try
-                {
-                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
-                }
-                catch
-                {
-                    logger.Error("Error loading ImageMagick. Will revert to GDI.");
-                }
-            }
-
-            try
-            {
-                return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
-            }
-            catch
-            {
-                logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
-            }
-
-            return new NullImageEncoder();
-        }
-    }
-}