colors: Revert palette changes. Fixes #266

This commit is contained in:
Dylan Araps 2018-06-26 07:31:47 +10:00
parent d49caeebfb
commit ae79aba6e0

View File

@ -35,12 +35,21 @@ def has_im():
def gen_colors(img):
"""Format the output from imagemagick into a list
of hex colors."""
raw_colors = imagemagick(20, img, has_im())
magick_command = has_im()
if len(raw_colors) < 16:
logging.error("Imagemagick couldn't generate a palette.")
logging.error("Try a different image or backend.")
sys.exit(1)
for i in range(0, 20, 1):
raw_colors = imagemagick(16 + i, img, magick_command)
if len(raw_colors) > 16:
break
elif i == 19:
logging.error("Imagemagick couldn't generate a suitable palette.")
sys.exit(1)
else:
logging.warning("Imagemagick couldn't generate a palette.")
logging.warning("Trying a larger palette size %s", 16 + i)
return [re.search("#.{6}", str(col)).group(0) for col in raw_colors[1:]]