mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-11-11 04:07:21 +03:00
a7e3b2e47b
There are two main issues fixed with this commit: * bytes vs. str: All file, image, and palette data are now handled as bytes. A new _binary module consolidates the hacks needed to do this across Python versions. tostring/fromstring methods have been renamed to tobytes/frombytes, but the Python 2.6/2.7 versions alias them to the old names for compatibility. Users should move to tobytes/frombytes. One other potentially-breaking change is that text data in image files (such as tags, comments) are now explicitly handled with a specific character encoding in mind. This works well with the Unicode str in Python 3, but may trip up old code expecting a straight byte-for-byte translation to a Python string. This also required a change to Gohlke's tags tests (in Tests/test_file_png.py) to expect Unicode strings from the code. * True div vs. floor div: Many division operations used the "/" operator to do floor division, which is now the "//" operator in Python 3. These were fixed. As of this commit, on the first pass, I have one failing test (improper handling of a slice object in a C module, test_imagepath.py) in Python 3, and three that that I haven't tried running yet (test_imagegl, test_imagegrab, and test_imageqt). I also haven't tested anything on Windows. All but the three skipped tests run flawlessly against Pythons 2.6 and 2.7.
94 lines
2.2 KiB
Python
94 lines
2.2 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# IM Tools support for PIL
|
|
#
|
|
# history:
|
|
# 1996-05-27 fl Created (read 8-bit images only)
|
|
# 2001-02-17 fl Use 're' instead of 'regex' (Python 2.1) (0.2)
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997-2001.
|
|
# Copyright (c) Fredrik Lundh 1996-2001.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
|
|
__version__ = "0.2"
|
|
|
|
import re
|
|
|
|
from . import Image, ImageFile
|
|
|
|
#
|
|
# --------------------------------------------------------------------
|
|
|
|
field = re.compile(br"([a-z]*) ([^ \r\n]*)")
|
|
|
|
##
|
|
# Image plugin for IM Tools images.
|
|
|
|
class ImtImageFile(ImageFile.ImageFile):
|
|
|
|
format = "IMT"
|
|
format_description = "IM Tools"
|
|
|
|
def _open(self):
|
|
|
|
# Quick rejection: if there's not a LF among the first
|
|
# 100 bytes, this is (probably) not a text header.
|
|
|
|
if not b"\n" in self.fp.read(100):
|
|
raise SyntaxError("not an IM file")
|
|
self.fp.seek(0)
|
|
|
|
xsize = ysize = 0
|
|
|
|
while True:
|
|
|
|
s = self.fp.read(1)
|
|
if not s:
|
|
break
|
|
|
|
if s == b'\x0C':
|
|
|
|
# image data begins
|
|
self.tile = [("raw", (0,0)+self.size,
|
|
self.fp.tell(),
|
|
(self.mode, 0, 1))]
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
# read key/value pair
|
|
# FIXME: dangerous, may read whole file
|
|
s = s + self.fp.readline()
|
|
if len(s) == 1 or len(s) > 100:
|
|
break
|
|
if s[0] == b"*":
|
|
continue # comment
|
|
|
|
m = field.match(s)
|
|
if not m:
|
|
break
|
|
k, v = m.group(1,2)
|
|
if k == "width":
|
|
xsize = int(v)
|
|
self.size = xsize, ysize
|
|
elif k == "height":
|
|
ysize = int(v)
|
|
self.size = xsize, ysize
|
|
elif k == "pixel" and v == "n8":
|
|
self.mode = "L"
|
|
|
|
|
|
#
|
|
# --------------------------------------------------------------------
|
|
|
|
Image.register_open("IMT", ImtImageFile)
|
|
|
|
#
|
|
# no extension registered (".im" is simply too common)
|