summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-03-04 19:26:34 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-03-04 19:26:34 +0100
commitd02ec4246813eb0787bf3ab54af1af9ce32bd376 (patch)
tree0d61985eb494a16e9f39d4ca18b6a513b01f94be
parent074889c54fe1763e1bc696ce695ca9bf54d17ec3 (diff)
downloadChimère-d02ec4246813eb0787bf3ab54af1af9ce32bd376.tar.bz2
Chimère-d02ec4246813eb0787bf3ab54af1af9ce32bd376.zip
Force JPG thumbnail to prevent resizing errors
-rw-r--r--chimere/models.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 05b280c..9efc0a0 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -788,7 +788,7 @@ def picturefile_post_save(sender, **kwargs):
basename, format = os.path.splitext(filetail)
basename = defaultfilters.slugify(basename)
basename = re.sub(r'-','_', basename)
- miniature = basename + '_thumb' + format
+ miniature = basename + '_thumb.jpg'
filename = file.path
miniature_filename = os.path.join(filehead, miniature)
try:
@@ -808,10 +808,12 @@ def picturefile_post_save(sender, **kwargs):
image.thumbnail([image_x, image_y], Image.ANTIALIAS)
temp_image = open(miniature_filename, 'w')
+ if image.mode != "RGB":
+ image = image.convert('RGB')
try:
- image.save(temp_image, image.format, quality=90, optimize=1)
+ image.save(temp_image, 'JPEG', quality=90, optimize=1)
except:
- image.save(temp_image, image.format, quality=90)
+ image.save(temp_image, 'JPEG', quality=90)
short_name = miniature_filename[len(settings.MEDIA_ROOT):]
picturefile.thumbnailfile = short_name