Merge branch 'master' into macos2

This commit is contained in:
Dylan Araps 2017-07-31 14:50:06 +10:00 committed by GitHub
commit db471199b7

View File

@ -56,7 +56,7 @@ def sort_colors(img, colors):
raw_colors = colors[:1] + colors[9:] + colors[8:] raw_colors = colors[:1] + colors[9:] + colors[8:]
# Darken the background color if it's too light. # Darken the background color if it's too light.
# The value can be a letter or an it so we treat the # The value can be a letter or an int so we treat the
# entire test as strings. # entire test as strings.
if raw_colors[0][1] not in ["0", "1", "2"]: if raw_colors[0][1] not in ["0", "1", "2"]:
raw_colors[0] = util.darken_color(raw_colors[0], 0.25) raw_colors[0] = util.darken_color(raw_colors[0], 0.25)