aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
diff options
context:
space:
mode:
authorherby2212 <12448284+herby2212@users.noreply.github.com>2023-10-21 01:20:59 +0200
committerherby2212 <12448284+herby2212@users.noreply.github.com>2023-10-21 01:20:59 +0200
commit27ceee8b6c70570129b917d8467a3a5bb058eab4 (patch)
tree49309bf28c40f19a2cdc96a3ac051e88f30f14b1 /MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
parente8a05ad996ab35909cd5928d49c4e8c46e9985d5 (diff)
parentdf7032b09e720cf07169514433557edf22922d0c (diff)
update to current master to resolve merge conflict
Diffstat (limited to 'MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs')
-rw-r--r--MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index 7912c5e87..953cfe698 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -119,7 +119,8 @@ namespace MediaBrowser.Controller.Drawing
private bool IsFormatSupported(string originalImagePath)
{
var ext = Path.GetExtension(originalImagePath);
- return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, "." + outputFormat, StringComparison.OrdinalIgnoreCase));
+ ext = ext.Replace(".jpeg", ".jpg", StringComparison.OrdinalIgnoreCase);
+ return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, outputFormat.GetExtension(), StringComparison.OrdinalIgnoreCase));
}
}
}