Fix dynamic thumbnails aspect

8 years ago · aea5461488
parent 95a22ae194
commit aea5461488
1 changed files with 3 additions and 0 deletions
--- a/synapse/rest/media/v1/media_repository.py
+++ b/synapse/rest/media/v1/media_repository.py
@ -240,6 +240,9 @@ class MediaRepository(object):
        if t_method == "crop":
            t_len = thumbnailer.crop(t_path, t_width, t_height, t_type)
        elif t_method == "scale":
+            t_width, t_height = thumbnailer.aspect(t_width, t_height)
+            t_width = min(m_width, t_width)
+            t_height = min(m_height, t_height)
            t_len = thumbnailer.scale(t_path, t_width, t_height, t_type)
        else:
            t_len = None