mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 11:28:58 +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.
83 lines
1.9 KiB
Python
83 lines
1.9 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# Sun image file handling
|
|
#
|
|
# History:
|
|
# 1995-09-10 fl Created
|
|
# 1996-05-28 fl Fixed 32-bit alignment
|
|
# 1998-12-29 fl Import ImagePalette module
|
|
# 2001-12-18 fl Fixed palette loading (from Jean-Claude Rimbault)
|
|
#
|
|
# Copyright (c) 1997-2001 by Secret Labs AB
|
|
# Copyright (c) 1995-1996 by Fredrik Lundh
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
|
|
__version__ = "0.3"
|
|
|
|
|
|
from . import Image, ImageFile, ImagePalette, _binary
|
|
|
|
i16 = _binary.i16be
|
|
i32 = _binary.i32be
|
|
|
|
|
|
def _accept(prefix):
|
|
return i32(prefix) == 0x59a66a95
|
|
|
|
##
|
|
# Image plugin for Sun raster files.
|
|
|
|
class SunImageFile(ImageFile.ImageFile):
|
|
|
|
format = "SUN"
|
|
format_description = "Sun Raster File"
|
|
|
|
def _open(self):
|
|
|
|
# HEAD
|
|
s = self.fp.read(32)
|
|
if i32(s) != 0x59a66a95:
|
|
raise SyntaxError("not an SUN raster file")
|
|
|
|
offset = 32
|
|
|
|
self.size = i32(s[4:8]), i32(s[8:12])
|
|
|
|
depth = i32(s[12:16])
|
|
if depth == 1:
|
|
self.mode, rawmode = "1", "1;I"
|
|
elif depth == 8:
|
|
self.mode = rawmode = "L"
|
|
elif depth == 24:
|
|
self.mode, rawmode = "RGB", "BGR"
|
|
else:
|
|
raise SyntaxError("unsupported mode")
|
|
|
|
compression = i32(s[20:24])
|
|
|
|
if i32(s[24:28]) != 0:
|
|
length = i32(s[28:32])
|
|
offset = offset + length
|
|
self.palette = ImagePalette.raw("RGB;L", self.fp.read(length))
|
|
if self.mode == "L":
|
|
self.mode = rawmode = "P"
|
|
|
|
stride = (((self.size[0] * depth + 7) // 8) + 3) & (~3)
|
|
|
|
if compression == 1:
|
|
self.tile = [("raw", (0,0)+self.size, offset, (rawmode, stride))]
|
|
elif compression == 2:
|
|
self.tile = [("sun_rle", (0,0)+self.size, offset, rawmode)]
|
|
|
|
#
|
|
# registry
|
|
|
|
Image.register_open("SUN", SunImageFile, _accept)
|
|
|
|
Image.register_extension("SUN", ".ras")
|