aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily <JustAMan@users.noreply.github.com>2019-01-29 16:10:51 +0300
committerGitHub <noreply@github.com>2019-01-29 16:10:51 +0300
commit6822975fd35cdf47188a151717274c8b39312975 (patch)
treec1be9f3d6975fb3416553f7b49da2fafccba386f
parenta05d803d4c188e3bc6ae22e5be907f74eec271bf (diff)
parentdc68d61491a21154e9f56a33b399d13b046ff1ac (diff)
Merge pull request #757 from cvium/fix_aspect_ratio_for_real
Fix default aspect ratio
-rw-r--r--MediaBrowser.Controller/Drawing/ImageHelper.cs3
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs2
2 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Drawing/ImageHelper.cs b/MediaBrowser.Controller/Drawing/ImageHelper.cs
index f88a63223..432cf8042 100644
--- a/MediaBrowser.Controller/Drawing/ImageHelper.cs
+++ b/MediaBrowser.Controller/Drawing/ImageHelper.cs
@@ -63,7 +63,8 @@ namespace MediaBrowser.Controller.Drawing
case ImageType.Logo:
return 2.58;
case ImageType.Primary:
- return item.GetDefaultPrimaryImageAspectRatio();
+ double defaultPrimaryImageAspectRatio = item.GetDefaultPrimaryImageAspectRatio();
+ return defaultPrimaryImageAspectRatio > 0 ? defaultPrimaryImageAspectRatio : 2.0 / 3;
default:
return 1;
}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 846fd9eec..0d1a0ce86 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1518,7 +1518,7 @@ namespace MediaBrowser.Controller.Entities
public virtual double GetDefaultPrimaryImageAspectRatio()
{
- return 2.0 / 3;
+ return 0;
}
public virtual string CreatePresentationUniqueKey()