diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:23:44 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:23:44 +0000 |
| commit | 9dc84b798932d9b0d8f935aca7d65dac3215920e (patch) | |
| tree | 8b5a7838192e91d5f2016f16ae4aa200cdd977db /synapse/rest/media/v1/thumbnailer.py | |
| parent | Incorporate review (diff) | |
| parent | Add benchmarks for structured logging performance (#6266) (diff) | |
| download | synapse-9dc84b798932d9b0d8f935aca7d65dac3215920e.tar.xz | |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/rest/media/v1/thumbnailer.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnailer.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 8cf415e29d..c234ea7421 100644 --- a/synapse/rest/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py @@ -129,5 +129,8 @@ class Thumbnailer(object): def _encode_image(self, output_image, output_type): output_bytes_io = BytesIO() - output_image.save(output_bytes_io, self.FORMATS[output_type], quality=80) + fmt = self.FORMATS[output_type] + if fmt == "JPEG": + output_image = output_image.convert("RGB") + output_image.save(output_bytes_io, fmt, quality=80) return output_bytes_io |