github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 23:39:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues in uploaded subreddit image processing.

Browse Source 
* Large jpg files (above 64k) will no longer fail.
* PNG to PNG no longer processes through PIL.
This commit is contained in:
Andre D
2011-10-26 16:12:21 -04:00
committed by Neil Williams
parent 24afcee3f2
commit bd0144d528
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
r2/r2/lib/media.py
View File

@@ -94,18 +94,25 @@ def upload_media(image, never_expire=True, file_type='.jpg'):
f = tempfile.NamedTemporaryFile(suffix=file_type, delete=False)
try:
img = image
do_convert = True
if isinstance(img, basestring):
img = str_to_image(img)
if not img.mode == 'RGBA': # Indexed images will not convert properly
img = img.convert('RGBA')
if img.format == "PNG" and file_type == ".png":
img.verify()
f.write(image)
f.close()
do_convert = False
if file_type == ".jpg":
# PIL does not play nice when converting alpha channels to jpg
background = Image.new('RGBA', img.size, (255, 255, 255))
background.paste(img, img)
img = background.convert('RGB')
img.save(f, quality=85, optimize=True)
if do_convert:
img = img.convert('RGBA')
if file_type == ".jpg":
# PIL does not play nice when converting alpha channels to jpg
background = Image.new('RGBA', img.size, (255, 255, 255))
background.paste(img, img)
img = background.convert('RGB')
img.save(f, quality=85) # Bug in the JPG encoder with the optimize flag, even if set to false
else:
img.save(f, optimize=True)
if file_type == ".png":
optimize_png(f.name, g.png_optimizer)