diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
| commit | b65327ff661b87991566314cf07088a7e789b69b (patch) | |
| tree | 75da1c79db8165ee6b3676b784a0d567551cb82d /synapse/rest/media/v1/thumbnailer.py | |
| parent | better logging (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b65327ff661b87991566314cf07088a7e789b69b.tar.xz | |
Merge branch 'develop' into rav/saml_mapping_work
Diffstat (limited to 'synapse/rest/media/v1/thumbnailer.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnailer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 90d8e6bffe..c995d7e043 100644 --- a/synapse/rest/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py @@ -78,9 +78,9 @@ class Thumbnailer(object): """ if max_width * self.height < max_height * self.width: - return (max_width, (max_width * self.height) // self.width) + return max_width, (max_width * self.height) // self.width else: - return ((max_height * self.width) // self.height, max_height) + return (max_height * self.width) // self.height, max_height def scale(self, width, height, output_type): """Rescales the image to the given dimensions. |