voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Give thumbnails a checkerboard bg for transparent images

Browse source
This commit is contained in:
voussoir 2017-03-04 19:27:03 -08:00
parent 83408aca4a
commit edc2ae2768
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
etiquette/helpers.py
View file

@ -2,6 +2,7 @@ import datetime
import math import math
import mimetypes import mimetypes
import os import os
import PIL.Image
from . import constants from . import constants
from . import exceptions from . import exceptions
@ -68,6 +69,17 @@ def binding_filler(column_names, values, require_all=True):
bindings = [values[column] for column in column_names] bindings = [values[column] for column in column_names]
return (qmarks, bindings) return (qmarks, bindings)
def checkerboard_image(color_1, color_2, image_size, checker_size):
image = PIL.Image.new('RGB', image_size, color_1)
checker = PIL.Image.new('RGB', (checker_size, checker_size), color_2)
offset = True
for y in range(0, image_size[1], checker_size):
for x in range(0, image_size[0], checker_size * 2):
x += offset * checker_size
image.paste(checker, (x, y))
offset = not offset
return image
def chunk_sequence(sequence, chunk_length, allow_incomplete=True): def chunk_sequence(sequence, chunk_length, allow_incomplete=True):
''' '''
Given a sequence, divide it into sequences of length `chunk_length`. Given a sequence, divide it into sequences of length `chunk_length`.

15
etiquette/objects.py
View file

@ -506,7 +506,6 @@ class Photo(ObjectBase):
self.photodb.log.debug('Thumbnailing %s' % self.real_filepath) self.photodb.log.debug('Thumbnailing %s' % self.real_filepath)
try: try:
image = PIL.Image.open(self.real_filepath) image = PIL.Image.open(self.real_filepath)
image = image.convert('RGB')
except (OSError, ValueError): except (OSError, ValueError):
pass pass
else: else:
@ -519,6 +518,20 @@ class Photo(ObjectBase):
) )
if new_width < width: if new_width < width:
image = image.resize((new_width, new_height)) image = image.resize((new_width, new_height))
if image.mode == 'RGBA':
background = helpers.checkerboard_image(
color_1=(256, 256, 256),
color_2=(128, 128, 128),
image_size=image.size,
checker_size=8,
)
# Thanks Yuji Tomita
# http://stackoverflow.com/a/9459208
background.paste(image, mask=image.split()[3])
image = background
image = image.convert('RGB')
image.save(hopeful_filepath, quality=50) image.save(hopeful_filepath, quality=50)
return_filepath = hopeful_filepath return_filepath = hopeful_filepath