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.
75 lines
1.8 KiB
Python
75 lines
1.8 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# XV Thumbnail file handler by Charles E. "Gene" Cash
|
|
# (gcash@magicnet.net)
|
|
#
|
|
# see xvcolor.c and xvbrowse.c in the sources to John Bradley's XV,
|
|
# available from ftp://ftp.cis.upenn.edu/pub/xv/
|
|
#
|
|
# history:
|
|
# 98-08-15 cec created (b/w only)
|
|
# 98-12-09 cec added color palette
|
|
# 98-12-28 fl added to PIL (with only a few very minor modifications)
|
|
#
|
|
# To do:
|
|
# FIXME: make save work (this requires quantization support)
|
|
#
|
|
|
|
__version__ = "0.1"
|
|
|
|
from . import Image, ImageFile, ImagePalette, _binary
|
|
|
|
o8 = _binary.o8
|
|
|
|
# standard color palette for thumbnails (RGB332)
|
|
PALETTE = b""
|
|
for r in range(8):
|
|
for g in range(8):
|
|
for b in range(4):
|
|
PALETTE = PALETTE + (o8((r*255)//7)+o8((g*255)//7)+o8((b*255)//3))
|
|
|
|
##
|
|
# Image plugin for XV thumbnail images.
|
|
|
|
class XVThumbImageFile(ImageFile.ImageFile):
|
|
|
|
format = "XVThumb"
|
|
format_description = "XV thumbnail image"
|
|
|
|
def _open(self):
|
|
|
|
# check magic
|
|
s = self.fp.read(6)
|
|
if s != b"P7 332":
|
|
raise SyntaxError("not an XV thumbnail file")
|
|
|
|
# Skip to beginning of next line
|
|
self.fp.readline()
|
|
|
|
# skip info comments
|
|
while True:
|
|
s = self.fp.readline()
|
|
if not s:
|
|
raise SyntaxError("Unexpected EOF reading XV thumbnail file")
|
|
if s[0] != b'#':
|
|
break
|
|
|
|
# parse header line (already read)
|
|
s = s.strip().split()
|
|
|
|
self.mode = "P"
|
|
self.size = int(s[0:1]), int(s[1:2])
|
|
|
|
self.palette = ImagePalette.raw("RGB", PALETTE)
|
|
|
|
self.tile = [
|
|
("raw", (0, 0)+self.size,
|
|
self.fp.tell(), (self.mode, 0, 1)
|
|
)]
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
Image.register_open("XVThumb", XVThumbImageFile)
|