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.
87 lines
1.9 KiB
Python
87 lines
1.9 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# Windows Cursor support for PIL
|
|
#
|
|
# notes:
|
|
# uses BmpImagePlugin.py to read the bitmap data.
|
|
#
|
|
# history:
|
|
# 96-05-27 fl Created
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1996.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
|
|
__version__ = "0.1"
|
|
|
|
from . import Image, BmpImagePlugin, _binary
|
|
|
|
|
|
#
|
|
# --------------------------------------------------------------------
|
|
|
|
i8 = _binary.i8
|
|
i16 = _binary.i16le
|
|
i32 = _binary.i32le
|
|
|
|
|
|
def _accept(prefix):
|
|
return prefix[:4] == b"\0\0\2\0"
|
|
|
|
##
|
|
# Image plugin for Windows Cursor files.
|
|
|
|
class CurImageFile(BmpImagePlugin.BmpImageFile):
|
|
|
|
format = "CUR"
|
|
format_description = "Windows Cursor"
|
|
|
|
def _open(self):
|
|
|
|
offset = self.fp.tell()
|
|
|
|
# check magic
|
|
s = self.fp.read(6)
|
|
if not _accept(s):
|
|
raise SyntaxError("not an CUR file")
|
|
|
|
# pick the largest cursor in the file
|
|
m = b""
|
|
for i in range(i16(s[4:])):
|
|
s = self.fp.read(16)
|
|
if not m:
|
|
m = s
|
|
elif i8(s[0]) > i8(m[0]) and i8(s[1]) > i8(m[1]):
|
|
m = s
|
|
#print "width", i8(s[0])
|
|
#print "height", i8(s[1])
|
|
#print "colors", i8(s[2])
|
|
#print "reserved", i8(s[3])
|
|
#print "hotspot x", i16(s[4:])
|
|
#print "hotspot y", i16(s[6:])
|
|
#print "bytes", i32(s[8:])
|
|
#print "offset", i32(s[12:])
|
|
|
|
# load as bitmap
|
|
self._bitmap(i32(m[12:]) + offset)
|
|
|
|
# patch up the bitmap height
|
|
self.size = self.size[0], self.size[1]//2
|
|
d, e, o, a = self.tile[0]
|
|
self.tile[0] = d, (0,0)+self.size, o, a
|
|
|
|
return
|
|
|
|
|
|
#
|
|
# --------------------------------------------------------------------
|
|
|
|
Image.register_open("CUR", CurImageFile, _accept)
|
|
|
|
Image.register_extension("CUR", ".cur")
|