python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 11:28:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong mode of gif image.

Browse Source 
In case of L mode and small image.
This commit is contained in:
Nikita Uvarov 2014-08-07 16:23:08 +03:00
parent 408e7335b3
commit 97e111d079
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PIL/GifImagePlugin.py
View File

@ -268,10 +268,9 @@ def _save(im, fp, filename):
except IOError: except IOError:
pass # write uncompressed file pass # write uncompressed file
try: if im.mode in RAWMODE:
rawmode = RAWMODE[im.mode]
imOut = im imOut = im
except KeyError: else:
# convert on the fly (EXPERIMENTAL -- I'm not sure PIL # convert on the fly (EXPERIMENTAL -- I'm not sure PIL
# should automatically convert images on save...) # should automatically convert images on save...)
if Image.getmodebase(im.mode) == "RGB": if Image.getmodebase(im.mode) == "RGB":
@ -279,10 +278,8 @@ def _save(im, fp, filename):
if im.palette: if im.palette:
palette_size = len(im.palette.getdata()[1]) // 3 palette_size = len(im.palette.getdata()[1]) // 3
imOut = im.convert("P", palette=1, colors=palette_size) imOut = im.convert("P", palette=1, colors=palette_size)
rawmode = "P"
else: else:
imOut = im.convert("L") imOut = im.convert("L")
rawmode = "L"
# header # header
try: try:
@ -290,12 +287,6 @@ def _save(im, fp, filename):
except KeyError: except KeyError:
palette = None palette = None
im.encoderinfo["optimize"] = im.encoderinfo.get("optimize", True) im.encoderinfo["optimize"] = im.encoderinfo.get("optimize", True)
if im.encoderinfo["optimize"]:
# When the mode is L, and we optimize, we end up with
# im.mode == P and rawmode = L, which fails.
# If we're optimizing the palette, we're going to be
# in a rawmode of P anyway.
rawmode = 'P'
header, usedPaletteColors = getheader(imOut, palette, im.encoderinfo) header, usedPaletteColors = getheader(imOut, palette, im.encoderinfo)
for s in header: for s in header:
@ -352,7 +343,7 @@ def _save(im, fp, filename):
o8(8)) # bits o8(8)) # bits
imOut.encoderconfig = (8, interlace) imOut.encoderconfig = (8, interlace)
ImageFile._save(imOut, fp, [("gif", (0,0)+im.size, 0, rawmode)]) ImageFile._save(imOut, fp, [("gif", (0,0)+im.size, 0, RAWMODE[imOut.mode])])
fp.write(b"\0") # end of image data fp.write(b"\0") # end of image data