Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ignore_white parametr, bump version #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions colorthief.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:copyright: (c) 2015 by Shipeng Feng.
:license: BSD, see LICENSE for more details.
"""
__version__ = '0.2.1'
__version__ = '0.2.2'

import math

Expand Down Expand Up @@ -38,7 +38,7 @@ def __init__(self, file):
"""
self.image = Image.open(file)

def get_color(self, quality=10):
def get_color(self, quality=10, ignore_white=True):
"""Get the dominant color.

:param quality: quality settings, 1 is the highest quality, the bigger
Expand All @@ -47,10 +47,10 @@ def get_color(self, quality=10):
visually most dominant color
:return tuple: (r, g, b)
"""
palette = self.get_palette(5, quality)
palette = self.get_palette(5, quality, ignore_white)
return palette[0]

def get_palette(self, color_count=10, quality=10):
def get_palette(self, color_count=10, quality=10, ignore_white=True):
"""Build a color palette. We are using the median cut algorithm to
cluster similar colors.

Expand All @@ -69,7 +69,7 @@ def get_palette(self, color_count=10, quality=10):
r, g, b, a = pixels[i]
# If pixel is mostly opaque and not white
if a >= 125:
if not (r > 250 and g > 250 and b > 250):
if not (r > 250 and g > 250 and b > 250 and ignore_white):
valid_pixels.append((r, g, b))

# Send array to quantize function which clusters values
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

setup(
name='colorthief',
version='0.2.1',
version='0.2.2',
url='https://github.com/fengsp/color-thief-py',
license='BSD',
author='Shipeng Feng',
Expand Down