summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-17 15:35:18 +0100
committerGitHub <noreply@github.com>2017-10-17 15:35:18 +0100
commitfe6e9f580b51ddcf61604d4c5998a4fe9a11cdf2 (patch)
treed585657030249e4400ceccf6193770bcbad33141 /synapse
parentImprove error handling for missing files (#2551) (diff)
parentfix thumbnailing (#2548) (diff)
downloadsynapse-fe6e9f580b51ddcf61604d4c5998a4fe9a11cdf2.tar.xz
Merge pull request #2550 from krombel/fix_thumbnail_2548
fix thumbnailing (#2548)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/media/v1/media_repository.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py
index 515b3d3e74..057c925b7b 100644
--- a/synapse/rest/media/v1/media_repository.py
+++ b/synapse/rest/media/v1/media_repository.py
@@ -490,12 +490,12 @@ class MediaRepository(object):
             if t_type == "crop":
                 t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
                     thumbnailer.crop,
-                    r_width, r_height, t_type,
+                    t_width, t_height, t_type,
                 ))
             else:
                 t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
                     thumbnailer.scale,
-                    r_width, r_height, t_type,
+                    t_width, t_height, t_type,
                 ))
 
             if not t_byte_source: