Merge pull request #475 from matrix-org/markjh/fix_thumbnail

Only use cropped thumbnails when asked for a cropped thumbnail.

synapse/rest/media/v1/thumbnail_resource.py

@@ -253,7 +253,7 @@ def _select_thumbnail(self, desired_width, desired_height, desired_method,
                 t_w = info["thumbnail_width"]
                 t_h = info["thumbnail_height"]
                 t_method = info["thumbnail_method"]
-                if t_method == "scale" or t_method == "crop":
+                if t_method == "crop":
                     aspect_quality = abs(d_w * t_h - d_h * t_w)
                     min_quality = 0 if d_w <= t_w and d_h <= t_h else 1
                     size_quality = abs((d_w - t_w) * (d_h - t_h))