Merge branch 'master' of https://github.com/dvska/Pillow into cleanup

This commit is contained in:
wiredfool 2014-05-09 20:49:25 -07:00
commit adc17c156d

View File

@ -45,7 +45,7 @@ def _parse_codestream(fp):
elif csiz == 3:
mode = 'RGB'
elif csiz == 4:
mode == 'RGBA'
mode = 'RGBA'
else:
mode = None
@ -122,7 +122,7 @@ def _parse_jp2_header(fp):
if nc == 3:
mode = 'RGB'
elif nc == 4:
mode == 'RGBA'
mode = 'RGBA'
break
return (size, mode)