mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 19:38:57 +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.
69 lines
1.6 KiB
Python
69 lines
1.6 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# PIXAR raster support for PIL
|
|
#
|
|
# history:
|
|
# 97-01-29 fl Created
|
|
#
|
|
# notes:
|
|
# This is incomplete; it is based on a few samples created with
|
|
# Photoshop 2.5 and 3.0, and a summary description provided by
|
|
# Greg Coats <gcoats@labiris.er.usgs.gov>. Hopefully, "L" and
|
|
# "RGBA" support will be added in future versions.
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1997.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
__version__ = "0.1"
|
|
|
|
from . import Image, ImageFile, _binary
|
|
|
|
#
|
|
# helpers
|
|
|
|
i16 = _binary.i16le
|
|
i32 = _binary.i32le
|
|
|
|
##
|
|
# Image plugin for PIXAR raster images.
|
|
|
|
class PixarImageFile(ImageFile.ImageFile):
|
|
|
|
format = "PIXAR"
|
|
format_description = "PIXAR raster image"
|
|
|
|
def _open(self):
|
|
|
|
# assuming a 4-byte magic label (FIXME: add "_accept" hook)
|
|
s = self.fp.read(4)
|
|
if s != b"\200\350\000\000":
|
|
raise SyntaxError("not a PIXAR file")
|
|
|
|
# read rest of header
|
|
s = s + self.fp.read(508)
|
|
|
|
self.size = i16(s[418:420]), i16(s[416:418])
|
|
|
|
# get channel/depth descriptions
|
|
mode = i16(s[424:426]), i16(s[426:428])
|
|
|
|
if mode == (14, 2):
|
|
self.mode = "RGB"
|
|
# FIXME: to be continued...
|
|
|
|
# create tile descriptor (assuming "dumped")
|
|
self.tile = [("raw", (0,0)+self.size, 1024, (self.mode, 0, 1))]
|
|
|
|
#
|
|
# --------------------------------------------------------------------
|
|
|
|
Image.register_open("PIXAR", PixarImageFile)
|
|
|
|
#
|
|
# FIXME: what's the standard extension?
|