OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2550 from krombel/fix_thumbnail_2548 

fix thumbnailing (#2548)
pull/2553/head
Erik Johnston 2017-10-17 15:35:18 +01:00 committed by GitHub
parent 7216c76654 a6245478c8
commit fe6e9f580b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/rest/media/v1/media_repository.py
View File

@ -490,12 +490,12 @@ class MediaRepository(object):
if t_type == "crop": if t_type == "crop":
t_byte_source = yield make_deferred_yieldable(threads.deferToThread( t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
thumbnailer.crop, thumbnailer.crop,
r_width, r_height, t_type, t_width, t_height, t_type,
)) ))
else: else:
t_byte_source = yield make_deferred_yieldable(threads.deferToThread( t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
thumbnailer.scale, thumbnailer.scale,
r_width, r_height, t_type, t_width, t_height, t_type,
)) ))
if not t_byte_source: if not t_byte_source: