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.
95 lines
2.4 KiB
Python
95 lines
2.4 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# XBM File handling
|
|
#
|
|
# History:
|
|
# 1995-09-08 fl Created
|
|
# 1996-11-01 fl Added save support
|
|
# 1997-07-07 fl Made header parser more tolerant
|
|
# 1997-07-22 fl Fixed yet another parser bug
|
|
# 2001-02-17 fl Use 're' instead of 'regex' (Python 2.1) (0.4)
|
|
# 2001-05-13 fl Added hotspot handling (based on code from Bernhard Herzog)
|
|
# 2004-02-24 fl Allow some whitespace before first #define
|
|
#
|
|
# Copyright (c) 1997-2004 by Secret Labs AB
|
|
# Copyright (c) 1996-1997 by Fredrik Lundh
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
__version__ = "0.6"
|
|
|
|
import re
|
|
from . import Image, ImageFile
|
|
|
|
# XBM header
|
|
xbm_head = re.compile(
|
|
b"\s*#define[ \t]+[^_]*_width[ \t]+(?P<width>[0-9]+)[\r\n]+"
|
|
b"#define[ \t]+[^_]*_height[ \t]+(?P<height>[0-9]+)[\r\n]+"
|
|
b"(?P<hotspot>"
|
|
b"#define[ \t]+[^_]*_x_hot[ \t]+(?P<xhot>[0-9]+)[\r\n]+"
|
|
b"#define[ \t]+[^_]*_y_hot[ \t]+(?P<yhot>[0-9]+)[\r\n]+"
|
|
b")?"
|
|
b"[\\000-\\377]*_bits\\[\\]"
|
|
)
|
|
|
|
def _accept(prefix):
|
|
return prefix.lstrip()[:7] == b"#define"
|
|
|
|
##
|
|
# Image plugin for X11 bitmaps.
|
|
|
|
class XbmImageFile(ImageFile.ImageFile):
|
|
|
|
format = "XBM"
|
|
format_description = "X11 Bitmap"
|
|
|
|
def _open(self):
|
|
|
|
m = xbm_head.match(self.fp.read(512))
|
|
|
|
if m:
|
|
|
|
xsize = int(m.group("width"))
|
|
ysize = int(m.group("height"))
|
|
|
|
if m.group("hotspot"):
|
|
self.info["hotspot"] = (
|
|
int(m.group("xhot")), int(m.group("yhot"))
|
|
)
|
|
|
|
self.mode = "1"
|
|
self.size = xsize, ysize
|
|
|
|
self.tile = [("xbm", (0, 0)+self.size, m.end(), None)]
|
|
|
|
|
|
def _save(im, fp, filename):
|
|
|
|
if im.mode != "1":
|
|
raise IOError("cannot write mode %s as XBM" % im.mode)
|
|
|
|
fp.write(("#define im_width %d\n" % im.size[0]).encode('ascii'))
|
|
fp.write(("#define im_height %d\n" % im.size[1]).encode('ascii'))
|
|
|
|
hotspot = im.encoderinfo.get("hotspot")
|
|
if hotspot:
|
|
fp.write(("#define im_x_hot %d\n" % hotspot[0]).encode('ascii'))
|
|
fp.write(("#define im_y_hot %d\n" % hotspot[1]).encode('ascii'))
|
|
|
|
fp.write(b"static char im_bits[] = {\n")
|
|
|
|
ImageFile._save(im, fp, [("xbm", (0,0)+im.size, 0, None)])
|
|
|
|
fp.write(b"};\n")
|
|
|
|
|
|
Image.register_open("XBM", XbmImageFile, _accept)
|
|
Image.register_save("XBM", _save)
|
|
|
|
Image.register_extension("XBM", ".xbm")
|
|
|
|
Image.register_mime("XBM", "image/xbm")
|