diff options
| author | Max Git <rotvel@gmail.com> | 2020-06-03 12:26:50 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-06-03 12:26:50 +0200 |
| commit | 5df00cb2b8013c143097caa7e350da2be05cc077 (patch) | |
| tree | b763d4f74c62fd215fb86c1a9f267c568e9dd3aa /Emby.Drawing/ImageProcessor.cs | |
| parent | e81140be206cbb55120e5da23e79e6609a4507e6 (diff) | |
| parent | 40502a33e0f0e3c84487be6d3eff2be35c1448ad (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
Diffstat (limited to 'Emby.Drawing/ImageProcessor.cs')
| -rw-r--r-- | Emby.Drawing/ImageProcessor.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs index 89bb3068b..47778acac 100644 --- a/Emby.Drawing/ImageProcessor.cs +++ b/Emby.Drawing/ImageProcessor.cs @@ -114,7 +114,7 @@ namespace Emby.Drawing => _transparentImageTypes.Contains(Path.GetExtension(path)); /// <inheritdoc /> - public async Task<(string path, string mimeType, DateTime dateModified)> ProcessImage(ImageProcessingOptions options) + public async Task<(string path, string? mimeType, DateTime dateModified)> ProcessImage(ImageProcessingOptions options) { ItemImageInfo originalImage = options.Image; BaseItem item = options.Item; @@ -230,7 +230,7 @@ namespace Emby.Drawing return ImageFormat.Jpg; } - private string GetMimeType(ImageFormat format, string path) + private string? GetMimeType(ImageFormat format, string path) => format switch { ImageFormat.Bmp => MimeTypes.GetMimeType("i.bmp"), |