python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-23 14:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sane quantize defaults for RGBA->P, fixes #544

Browse Source
This commit is contained in:
wiredfool 2014-03-25 21:35:20 -07:00
parent 9518214980
commit abebac25cc
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PIL/Image.py
View File

@ -735,6 +735,9 @@ class Image:
im = self.im.convert_matrix(mode, matrix) im = self.im.convert_matrix(mode, matrix)
return self._new(im) return self._new(im)
if mode == "P" and self.mode == "RGBA":
return self.quantize(colors)
if mode == "P" and palette == ADAPTIVE: if mode == "P" and palette == ADAPTIVE:
im = self.im.quantize(colors) im = self.im.quantize(colors)
new = self._new(im) new = self._new(im)
@ -762,7 +765,7 @@ class Image:
return self._new(im) return self._new(im)
def quantize(self, colors=256, method=0, kmeans=0, palette=None): def quantize(self, colors=256, method=None, kmeans=0, palette=None):
# methods: # methods:
# 0 = median cut # 0 = median cut
@ -774,6 +777,17 @@ class Image:
self.load() self.load()
if method is None:
# defaults:
method = 0
if self.mode == 'RGBA':
method = 2
if self.mode == 'RGBA' and method != 2:
# Caller specified an invalid mode.
raise ValueError('Fast Octree (method == 2) is the ' +
' only valid method for quantizing RGBA images')
if palette: if palette:
# use palette from reference image # use palette from reference image
palette.load() palette.load()