alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

(mostly)Fix ResizeFill

Browse Source
This commit is contained in:
Odd Stråbø
2021-03-17 19:45:28 +01:00
parent 383aa4e4d9
commit 13d0837b78
3 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Model/Drawing/DrawingUtils.cs
View File

@@ -58,7 +58,7 @@ namespace MediaBrowser.Model.Drawing
}
/// <summary>
/// Resizes to fill box.
/// Scale down to fill box.
/// Returns original size if both width and height are null or zero.
/// </summary>
/// <param name="size">The original size object.</param>
@@ -71,9 +71,8 @@ namespace MediaBrowser.Model.Drawing
int? fillHeight)
{
// Return original size if input is invalid.
if (
(fillWidth == null && fillHeight == null)
|| (fillWidth == 0 || fillHeight == 0))
if ((fillWidth == null || fillWidth == 0)
&& (fillHeight == null || fillHeight == 0))
{
return size;
}
@@ -89,9 +88,8 @@ namespace MediaBrowser.Model.Drawing
}
double widthRatio = (double)size.Width / (double)fillWidth;
double heightRatio = (double)size.Height / (double)fillHeight!;
// min()
double scaleRatio = widthRatio > heightRatio ? heightRatio : widthRatio;
double heightRatio = (double)size.Height / (double)fillHeight;
double scaleRatio = Math.Min(widthRatio, heightRatio);
// Clamp to current size.
if (scaleRatio < 1)