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

Merge pull request #2557 from matrix-org/erikj/media_tumbnails 

Fix typo in thumbnail generation
pull/2558/head
Erik Johnston 2017-10-19 10:38:52 +01:00 committed by GitHub
parent 161a862ffb bd5718d0ad
commit f4f65ef93e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,16 +487,19 @@ class MediaRepository(object):
) )
# Generate the thumbnail # Generate the thumbnail
if t_type == "crop": if t_method == "crop":
t_byte_source = yield make_deferred_yieldable(threads.deferToThread( t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
thumbnailer.crop, thumbnailer.crop,
t_width, t_height, t_type, t_width, t_height, t_type,
)) ))
else: elif t_method == "scale":
t_byte_source = yield make_deferred_yieldable(threads.deferToThread( t_byte_source = yield make_deferred_yieldable(threads.deferToThread(
thumbnailer.scale, thumbnailer.scale,
t_width, t_height, t_type, t_width, t_height, t_type,
)) ))
else:
logger.error("Unrecognized method: %r", t_method)
continue
if not t_byte_source: if not t_byte_source:
continue continue