mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-27 09:44:31 +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.
131 lines
3.0 KiB
Python
131 lines
3.0 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# XPM File handling
|
|
#
|
|
# History:
|
|
# 1996-12-29 fl Created
|
|
# 2001-02-17 fl Use 're' instead of 'regex' (Python 2.1) (0.7)
|
|
#
|
|
# 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, ImagePalette
|
|
from ._binary import i8, o8
|
|
|
|
# XPM header
|
|
xpm_head = re.compile(b"\"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)")
|
|
|
|
|
|
def _accept(prefix):
|
|
return prefix[:9] == b"/* XPM */"
|
|
|
|
##
|
|
# Image plugin for X11 pixel maps.
|
|
|
|
class XpmImageFile(ImageFile.ImageFile):
|
|
|
|
format = "XPM"
|
|
format_description = "X11 Pixel Map"
|
|
|
|
def _open(self):
|
|
|
|
if not _accept(self.fp.read(9)):
|
|
raise SyntaxError("not an XPM file")
|
|
|
|
# skip forward to next string
|
|
while True:
|
|
s = self.fp.readline()
|
|
if not s:
|
|
raise SyntaxError("broken XPM file")
|
|
m = xpm_head.match(s)
|
|
if m:
|
|
break
|
|
|
|
self.size = int(m.group(1)), int(m.group(2))
|
|
|
|
pal = int(m.group(3))
|
|
bpp = int(m.group(4))
|
|
|
|
if pal > 256 or bpp != 1:
|
|
raise ValueError("cannot read this XPM file")
|
|
|
|
#
|
|
# load palette description
|
|
|
|
palette = [b"\0\0\0"] * 256
|
|
|
|
for i in range(pal):
|
|
|
|
s = self.fp.readline()
|
|
if s[-2:] == b'\r\n':
|
|
s = s[:-2]
|
|
elif s[-1:] in b'\r\n':
|
|
s = s[:-1]
|
|
|
|
c = i8(s[1])
|
|
s = s[2:-2].split()
|
|
|
|
for i in range(0, len(s), 2):
|
|
|
|
if s[i] == "c":
|
|
|
|
# process colour key
|
|
rgb = s[i+1]
|
|
if rgb == b"None":
|
|
self.info["transparency"] = c
|
|
elif rgb[0] == b"#":
|
|
# FIXME: handle colour names (see ImagePalette.py)
|
|
rgb = int(rgb[1:], 16)
|
|
palette[c] = o8((rgb >> 16) & 255) +\
|
|
o8((rgb >> 8) & 255) +\
|
|
o8(rgb & 255)
|
|
else:
|
|
# unknown colour
|
|
raise ValueError("cannot read this XPM file")
|
|
break
|
|
|
|
else:
|
|
|
|
# missing colour key
|
|
raise ValueError("cannot read this XPM file")
|
|
|
|
self.mode = "P"
|
|
self.palette = ImagePalette.raw("RGB", b"".join(palette))
|
|
|
|
self.tile = [("raw", (0, 0)+self.size, self.fp.tell(), ("P", 0, 1))]
|
|
|
|
def load_read(self, bytes):
|
|
|
|
#
|
|
# load all image data in one chunk
|
|
|
|
xsize, ysize = self.size
|
|
|
|
s = [None] * ysize
|
|
|
|
for i in range(ysize):
|
|
s[i] = self.fp.readline()[1:xsize+1].ljust(xsize)
|
|
|
|
self.fp = None
|
|
|
|
return b"".join(s)
|
|
|
|
#
|
|
# Registry
|
|
|
|
Image.register_open("XPM", XpmImageFile, _accept)
|
|
|
|
Image.register_extension("XPM", ".xpm")
|
|
|
|
Image.register_mime("XPM", "image/xpm")
|