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.
70 lines
1.5 KiB
Python
70 lines
1.5 KiB
Python
#
|
|
# The Python Imaging Library
|
|
# $Id$
|
|
#
|
|
# load a GIMP brush file
|
|
#
|
|
# History:
|
|
# 96-03-14 fl Created
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1996.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
from . import Image, ImageFile, _binary
|
|
|
|
i32 = _binary.i32be
|
|
|
|
def _accept(prefix):
|
|
return i32(prefix) >= 20 and i32(prefix[4:8]) == 1
|
|
|
|
##
|
|
# Image plugin for the GIMP brush format.
|
|
|
|
class GbrImageFile(ImageFile.ImageFile):
|
|
|
|
format = "GBR"
|
|
format_description = "GIMP brush file"
|
|
|
|
def _open(self):
|
|
|
|
header_size = i32(self.fp.read(4))
|
|
version = i32(self.fp.read(4))
|
|
if header_size < 20 or version != 1:
|
|
raise SyntaxError("not a GIMP brush")
|
|
|
|
width = i32(self.fp.read(4))
|
|
height = i32(self.fp.read(4))
|
|
bytes = i32(self.fp.read(4))
|
|
if width <= 0 or height <= 0 or bytes != 1:
|
|
raise SyntaxError("not a GIMP brush")
|
|
|
|
comment = self.fp.read(header_size - 20)[:-1]
|
|
|
|
self.mode = "L"
|
|
self.size = width, height
|
|
|
|
self.info["comment"] = comment
|
|
|
|
# Since the brush is so small, we read the data immediately
|
|
self.data = self.fp.read(width * height)
|
|
|
|
def load(self):
|
|
|
|
if not self.data:
|
|
return
|
|
|
|
# create an image out of the brush data block
|
|
self.im = Image.core.new(self.mode, self.size)
|
|
self.im.frombytes(self.data)
|
|
self.data = b""
|
|
|
|
#
|
|
# registry
|
|
|
|
Image.register_open("GBR", GbrImageFile, _accept)
|
|
|
|
Image.register_extension("GBR", ".gbr")
|