python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-27 10:26:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor _convert_mode -> _normalize_mode

Browse Source
This commit is contained in:
wiredfool 2017-02-23 06:58:37 -08:00
parent b9618b3ce7
commit 26e145c8a3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PIL/GifImagePlugin.py
View File

@ -293,25 +293,21 @@ RAWMODE = {
} }
def _convert_mode(im, initial_call=False): def _normalize_mode(im, initial_call=False):
# convert on the fly (EXPERIMENTAL -- I'm not sure PIL if im.mode in RAWMODE:
# should automatically convert images on save...) return im
if Image.getmodebase(im.mode) == "RGB": if Image.getmodebase(im.mode) == "RGB":
if initial_call: if initial_call:
palette_size = 256 palette_size = 256
if im.palette: if im.palette:
palette_size = len(im.palette.getdata()[1]) // 3 palette_size = len(im.palette.getdata()[1]) // 3
return im.convert("P", palette=1, colors=palette_size) return im.convert("P", palette=Image.ADAPTIVE, colors=palette_size)
else: else:
return im.convert("P") return im.convert("P")
return im.convert("L") return im.convert("L")
def _write_single_frame(im, fp, palette): def _write_single_frame(im, fp, palette):
if im.mode in RAWMODE: im_out = _normalize_mode(im, True)
im_out = im.copy()
else:
im_out = _convert_mode(im, True)
im_out = _normalize_palette(im_out, palette, im.encoderinfo) im_out = _normalize_palette(im_out, palette, im.encoderinfo)
for s in _get_global_header(im_out, palette, im.encoderinfo): for s in _get_global_header(im_out, palette, im.encoderinfo):
@ -339,7 +335,7 @@ def _write_multiple_frames(im, fp, palette):
frame_count = 0 frame_count = 0
for imSequence in [im]+im.encoderinfo.get("append_images", []): for imSequence in [im]+im.encoderinfo.get("append_images", []):
for im_frame in ImageSequence.Iterator(imSequence): for im_frame in ImageSequence.Iterator(imSequence):
im_frame = _convert_mode(im_frame) im_frame = _normalize_mode(im_frame)
im_frame = _normalize_palette(im_frame, palette, im.encoderinfo) im_frame = _normalize_palette(im_frame, palette, im.encoderinfo)
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()