From 80c15fedfc269e5234ffee4b78c93412a2287a4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Fri, 27 Jan 2012 19:45:06 +0000 Subject: [PATCH] allow non-square podcast logos --- mygpo/web/templatetags/podcasts.py | 2 +- mygpo/web/views/__init__.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mygpo/web/templatetags/podcasts.py b/mygpo/web/templatetags/podcasts.py index 4c9a1979..6d29dffe 100644 --- a/mygpo/web/templatetags/podcasts.py +++ b/mygpo/web/templatetags/podcasts.py @@ -13,7 +13,7 @@ from mygpo.web.utils import get_podcast_link_target, \ register = template.Library() def create_podcast_logo(podcast, size): size = int(size) - s = '%s' % (podcast.get_logo_url(size), _('Logo'), size, size) + s = '%s' % (podcast.get_logo_url(size), _('Logo'),) return mark_safe(s) @register.filter diff --git a/mygpo/web/views/__init__.py b/mygpo/web/views/__init__.py index e249a9e1..c38e8936 100644 --- a/mygpo/web/views/__init__.py +++ b/mygpo/web/views/__init__.py @@ -128,7 +128,8 @@ def cover_art(request, size, filename): raise Http404('Cannot open cover file') try: - resized = im.resize((size, size), Image.ANTIALIAS) + im.thumbnail((size, size), Image.ANTIALIAS) + resized = im except IOError: # raised when trying to read an interlaced PNG; we use the original instead return HttpResponsePermanentRedirect('/media/logo/%s' % filename) -- 2.11.4.GIT