2010-07-31 06:52:47 +04:00
|
|
|
#
|
|
|
|
|
# The Python Imaging Library.
|
|
|
|
|
# $Id$
|
|
|
|
|
#
|
|
|
|
|
# PCX file handling
|
|
|
|
|
#
|
|
|
|
|
# This format was originally used by ZSoft's popular PaintBrush
|
|
|
|
|
# program for the IBM PC. It is also supported by many MS-DOS and
|
|
|
|
|
# Windows applications, including the Windows PaintBrush program in
|
|
|
|
|
# Windows 3.
|
|
|
|
|
#
|
|
|
|
|
# history:
|
|
|
|
|
# 1995-09-01 fl Created
|
|
|
|
|
# 1996-05-20 fl Fixed RGB support
|
|
|
|
|
# 1997-01-03 fl Fixed 2-bit and 4-bit support
|
|
|
|
|
# 1999-02-03 fl Fixed 8-bit support (broken in 1.0b1)
|
|
|
|
|
# 1999-02-07 fl Added write support
|
|
|
|
|
# 2002-06-09 fl Made 2-bit and 4-bit support a bit more robust
|
|
|
|
|
# 2002-07-30 fl Seek from to current position, not beginning of file
|
|
|
|
|
# 2003-06-03 fl Extract DPI settings (info["dpi"])
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 1997-2003 by Secret Labs AB.
|
|
|
|
|
# Copyright (c) 1995-2003 by Fredrik Lundh.
|
|
|
|
|
#
|
|
|
|
|
# See the README file for information on usage and redistribution.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
__version__ = "0.6"
|
|
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
from . import Image, ImageFile, ImagePalette, _binary
|
2010-07-31 06:52:47 +04:00
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
i8 = _binary.i8
|
|
|
|
|
i16 = _binary.i16le
|
|
|
|
|
o8 = _binary.o8
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
def _accept(prefix):
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
return i8(prefix[0]) == 10 and i8(prefix[1]) in [0, 2, 3, 5]
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
##
|
|
|
|
|
# Image plugin for Paintbrush images.
|
|
|
|
|
|
|
|
|
|
class PcxImageFile(ImageFile.ImageFile):
|
|
|
|
|
|
|
|
|
|
format = "PCX"
|
|
|
|
|
format_description = "Paintbrush"
|
|
|
|
|
|
|
|
|
|
def _open(self):
|
|
|
|
|
|
|
|
|
|
# header
|
|
|
|
|
s = self.fp.read(128)
|
|
|
|
|
if not _accept(s):
|
2012-10-11 07:52:53 +04:00
|
|
|
raise SyntaxError("not a PCX file")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
# image
|
|
|
|
|
bbox = i16(s,4), i16(s,6), i16(s,8)+1, i16(s,10)+1
|
|
|
|
|
if bbox[2] <= bbox[0] or bbox[3] <= bbox[1]:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise SyntaxError("bad PCX image size")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
# format
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
version = i8(s[1])
|
|
|
|
|
bits = i8(s[3])
|
|
|
|
|
planes = i8(s[65])
|
2010-07-31 06:52:47 +04:00
|
|
|
stride = i16(s,66)
|
|
|
|
|
|
|
|
|
|
self.info["dpi"] = i16(s,12), i16(s,14)
|
|
|
|
|
|
|
|
|
|
if bits == 1 and planes == 1:
|
|
|
|
|
mode = rawmode = "1"
|
|
|
|
|
|
|
|
|
|
elif bits == 1 and planes in (2, 4):
|
|
|
|
|
mode = "P"
|
|
|
|
|
rawmode = "P;%dL" % planes
|
|
|
|
|
self.palette = ImagePalette.raw("RGB", s[16:64])
|
|
|
|
|
|
|
|
|
|
elif version == 5 and bits == 8 and planes == 1:
|
|
|
|
|
mode = rawmode = "L"
|
|
|
|
|
# FIXME: hey, this doesn't work with the incremental loader !!!
|
|
|
|
|
self.fp.seek(-769, 2)
|
|
|
|
|
s = self.fp.read(769)
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
if len(s) == 769 and i8(s[0]) == 12:
|
2010-07-31 06:52:47 +04:00
|
|
|
# check if the palette is linear greyscale
|
|
|
|
|
for i in range(256):
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
if s[i*3+1:i*3+4] != o8(i)*3:
|
2010-07-31 06:52:47 +04:00
|
|
|
mode = rawmode = "P"
|
|
|
|
|
break
|
|
|
|
|
if mode == "P":
|
|
|
|
|
self.palette = ImagePalette.raw("RGB", s[1:])
|
|
|
|
|
self.fp.seek(128)
|
|
|
|
|
|
|
|
|
|
elif version == 5 and bits == 8 and planes == 3:
|
|
|
|
|
mode = "RGB"
|
|
|
|
|
rawmode = "RGB;L"
|
|
|
|
|
|
|
|
|
|
else:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise IOError("unknown PCX mode")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
self.mode = mode
|
|
|
|
|
self.size = bbox[2]-bbox[0], bbox[3]-bbox[1]
|
|
|
|
|
|
|
|
|
|
bbox = (0, 0) + self.size
|
|
|
|
|
|
|
|
|
|
self.tile = [("pcx", bbox, self.fp.tell(), (rawmode, planes * stride))]
|
|
|
|
|
|
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
|
# save PCX files
|
|
|
|
|
|
|
|
|
|
SAVE = {
|
|
|
|
|
# mode: (version, bits, planes, raw mode)
|
|
|
|
|
"1": (2, 1, 1, "1"),
|
|
|
|
|
"L": (5, 8, 1, "L"),
|
|
|
|
|
"P": (5, 8, 1, "P"),
|
|
|
|
|
"RGB": (5, 8, 3, "RGB;L"),
|
|
|
|
|
}
|
|
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
o16 = _binary.o16le
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
def _save(im, fp, filename, check=0):
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
version, bits, planes, rawmode = SAVE[im.mode]
|
|
|
|
|
except KeyError:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise ValueError("Cannot save %s images as PCX" % im.mode)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
if check:
|
|
|
|
|
return check
|
|
|
|
|
|
|
|
|
|
# bytes per plane
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
stride = (im.size[0] * bits + 7) // 8
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
# under windows, we could determine the current screen size with
|
|
|
|
|
# "Image.core.display_mode()[1]", but I think that's overkill...
|
|
|
|
|
|
|
|
|
|
screen = im.size
|
|
|
|
|
|
|
|
|
|
dpi = 100, 100
|
|
|
|
|
|
|
|
|
|
# PCX header
|
|
|
|
|
fp.write(
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
o8(10) + o8(version) + o8(1) + o8(bits) + o16(0) +
|
2010-07-31 06:52:47 +04:00
|
|
|
o16(0) + o16(im.size[0]-1) + o16(im.size[1]-1) + o16(dpi[0]) +
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
o16(dpi[1]) + b"\0"*24 + b"\xFF"*24 + b"\0" + o8(planes) +
|
2010-07-31 06:52:47 +04:00
|
|
|
o16(stride) + o16(1) + o16(screen[0]) + o16(screen[1]) +
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
b"\0"*54
|
2010-07-31 06:52:47 +04:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
assert fp.tell() == 128
|
|
|
|
|
|
|
|
|
|
ImageFile._save(im, fp, [("pcx", (0,0)+im.size, 0,
|
|
|
|
|
(rawmode, bits*planes))])
|
|
|
|
|
|
|
|
|
|
if im.mode == "P":
|
|
|
|
|
# colour palette
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
fp.write(o8(12))
|
2010-07-31 06:52:47 +04:00
|
|
|
fp.write(im.im.getpalette("RGB", "RGB")) # 768 bytes
|
|
|
|
|
elif im.mode == "L":
|
|
|
|
|
# greyscale palette
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
fp.write(o8(12))
|
2010-07-31 06:52:47 +04:00
|
|
|
for i in range(256):
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
fp.write(o8(i)*3)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
|
# registry
|
|
|
|
|
|
|
|
|
|
Image.register_open("PCX", PcxImageFile, _accept)
|
|
|
|
|
Image.register_save("PCX", _save)
|
|
|
|
|
|
|
|
|
|
Image.register_extension("PCX", ".pcx")
|
