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

Fix tga files with image ID field

Browse Source
This commit is contained in:
Alexey Buzanov 2014-08-19 17:53:51 +04:00
parent 735d45b175
commit 1bd4919a35
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PIL/TgaImagePlugin.py
View File

@ -19,6 +19,7 @@
__version__ = "0.3" __version__ = "0.3"
import os
from PIL import Image, ImageFile, ImagePalette, _binary from PIL import Image, ImageFile, ImagePalette, _binary
@ -42,9 +43,6 @@ MODES = {
} }
def _accept(prefix):
return prefix[0:1] == b"\0"
## ##
# Image plugin for Targa files. # Image plugin for Targa files.
@ -58,7 +56,7 @@ class TgaImageFile(ImageFile.ImageFile):
# process header # process header
s = self.fp.read(18) s = self.fp.read(18)
id = i8(s[0]) idlen = i8(s[0])
colormaptype = i8(s[1]) colormaptype = i8(s[1])
imagetype = i8(s[2]) imagetype = i8(s[2])
@ -70,7 +68,7 @@ class TgaImageFile(ImageFile.ImageFile):
self.size = i16(s[12:]), i16(s[14:]) self.size = i16(s[12:]), i16(s[14:])
# validate header fields # validate header fields
if id != 0 or colormaptype not in (0, 1) or\ if colormaptype not in (0, 1) or\
self.size[0] <= 0 or self.size[1] <= 0 or\ self.size[0] <= 0 or self.size[1] <= 0 or\
depth not in (1, 8, 16, 24, 32): depth not in (1, 8, 16, 24, 32):
raise SyntaxError("not a TGA file") raise SyntaxError("not a TGA file")
@ -103,6 +101,9 @@ class TgaImageFile(ImageFile.ImageFile):
if imagetype & 8: if imagetype & 8:
self.info["compression"] = "tga_rle" self.info["compression"] = "tga_rle"
if idlen:
self.fp.seek(idlen, os.SEEK_CUR)
if colormaptype: if colormaptype:
# read palette # read palette
start, size, mapdepth = i16(s[3:]), i16(s[5:]), i16(s[7:]) start, size, mapdepth = i16(s[3:]), i16(s[5:]), i16(s[7:])
@ -191,7 +192,7 @@ def _save(im, fp, filename, check=0):
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Registry # Registry
Image.register_open("TGA", TgaImageFile, _accept) Image.register_open("TGA", TgaImageFile)
Image.register_save("TGA", _save) Image.register_save("TGA", _save)
Image.register_extension("TGA", ".tga") Image.register_extension("TGA", ".tga")