odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] turns out PIL provides its own mime mapping... 

bzr revid: xmo@openerp.com-20131004091731-8r235491f3h2af2q
This commit is contained in:
Xavier Morel 2013-10-04 11:17:31 +02:00
parent 400ffb7f07
commit 6ed1edf538
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/website/controllers/main.py
View File

@ -34,8 +34,6 @@ def auth_method_public():
http.auth_methods['public'] = auth_method_public
NOPE = object()
# PIL images have a type flag, but no MIME. Reverse type flag to MIME.
PIL_MIME_MAPPING = {'PNG': 'image/png', 'JPEG': 'image/jpeg', 'GIF': 'image/gif', }
# Completely arbitrary limits
MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
class Website(openerp.addons.web.controllers.main.Home):
@ -327,7 +325,7 @@ class Images(http.Controller):
# FIXME: unknown format or not an image
image = Image.open(buf)
response.mimetype = PIL_MIME_MAPPING[image.format]
response.mimetype = Image.MIME[image.format]
w, h = image.size
max_w, max_h = fit