diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-17 15:35:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 15:35:18 +0100 |
| commit | fe6e9f580b51ddcf61604d4c5998a4fe9a11cdf2 (patch) | |
| tree | d585657030249e4400ceccf6193770bcbad33141 /synapse | |
| parent | Improve error handling for missing files (#2551) (diff) | |
| parent | fix thumbnailing (#2548) (diff) | |
| download | synapse-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.py | 4 |
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: |