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

flake8 and tests

Browse Source
This commit is contained in:
Alexey Buzanov 2014-08-20 10:32:06 +04:00
parent 1bd4919a35
commit f94b6b4025
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PIL/TgaImagePlugin.py
View File

@ -19,7 +19,6 @@
__version__ = "0.3" __version__ = "0.3"
import os
from PIL import Image, ImageFile, ImagePalette, _binary from PIL import Image, ImageFile, ImagePalette, _binary
@ -102,24 +101,24 @@ class TgaImageFile(ImageFile.ImageFile):
self.info["compression"] = "tga_rle" self.info["compression"] = "tga_rle"
if idlen: if idlen:
self.fp.seek(idlen, os.SEEK_CUR) self.info["id_section"] = self.fp.read(idlen)
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:])
if mapdepth == 16: if mapdepth == 16:
self.palette = ImagePalette.raw("BGR;16", self.palette = ImagePalette.raw(
b"\0"*2*start + self.fp.read(2*size)) "BGR;16", b"\0"*2*start + self.fp.read(2*size))
elif mapdepth == 24: elif mapdepth == 24:
self.palette = ImagePalette.raw("BGR", self.palette = ImagePalette.raw(
b"\0"*3*start + self.fp.read(3*size)) "BGR", b"\0"*3*start + self.fp.read(3*size))
elif mapdepth == 32: elif mapdepth == 32:
self.palette = ImagePalette.raw("BGRA", self.palette = ImagePalette.raw(
b"\0"*4*start + self.fp.read(4*size)) "BGRA", b"\0"*4*start + self.fp.read(4*size))
# setup tile descriptor # setup tile descriptor
try: try:
rawmode = MODES[(imagetype&7, depth)] rawmode = MODES[(imagetype & 7, depth)]
if imagetype & 8: if imagetype & 8:
# compressed # compressed
self.tile = [("tga_rle", (0, 0)+self.size, self.tile = [("tga_rle", (0, 0)+self.size,
@ -146,6 +145,7 @@ SAVE = {
"RGBA": ("BGRA", 32, 0, 2), "RGBA": ("BGRA", 32, 0, 2),
} }
def _save(im, fp, filename, check=0): def _save(im, fp, filename, check=0):
try: try:
@ -186,7 +186,8 @@ def _save(im, fp, filename, check=0):
if colormaptype: if colormaptype:
fp.write(im.im.getpalette("RGB", "BGR")) fp.write(im.im.getpalette("RGB", "BGR"))
ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, 0, orientation))]) ImageFile._save(
im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))])
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------

BIN
Tests/images/tga_id_field.tga Normal file
View File

Binary file not shown.

22
Tests/test_file_tga.py Normal file
View File

@ -0,0 +1,22 @@
from helper import unittest, PillowTestCase
from PIL import Image
class TestFileSun(PillowTestCase):
def test_sanity(self):
# tga file with id field
test_file = "Tests/images/tga_id_field.tga"
# Act
im = Image.open(test_file)
# Assert
self.assertEqual(im.size, (100, 100))
if __name__ == '__main__':
unittest.main()
# End of file