Merge branch 'dev' into imagesize

This commit is contained in:
Andrew Rabert
2019-01-20 20:45:06 -05:00
committed by GitHub
204 changed files with 1286 additions and 12832 deletions

View File

@@ -21,9 +21,13 @@ namespace Emby.Drawing
private readonly IFileSystem _fileSystem;
private static ILocalizationManager _localizationManager;
public SkiaEncoder(ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem, ILocalizationManager localizationManager)
public SkiaEncoder(
ILoggerFactory loggerFactory,
IApplicationPaths appPaths,
IFileSystem fileSystem,
ILocalizationManager localizationManager)
{
_logger = logger;
_logger = loggerFactory.CreateLogger("ImageEncoder");
_appPaths = appPaths;
_fileSystem = fileSystem;
_localizationManager = localizationManager;