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.
90 lines
2.1 KiB
Python
90 lines
2.1 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# GD file handling
|
|
#
|
|
# History:
|
|
# 1996-04-12 fl Created
|
|
#
|
|
# Copyright (c) 1997 by Secret Labs AB.
|
|
# Copyright (c) 1996 by Fredrik Lundh.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
|
|
# NOTE: This format cannot be automatically recognized, so the
|
|
# class is not registered for use with Image.open(). To open a
|
|
# gd file, use the GdImageFile.open() function instead.
|
|
|
|
# THE GD FORMAT IS NOT DESIGNED FOR DATA INTERCHANGE. This
|
|
# implementation is provided for convenience and demonstrational
|
|
# purposes only.
|
|
|
|
|
|
__version__ = "0.1"
|
|
|
|
from . import ImageFile, ImagePalette, _binary
|
|
|
|
try:
|
|
import builtins
|
|
except ImportError:
|
|
import __builtin__
|
|
builtins = __builtin__
|
|
|
|
i16 = _binary.i16be
|
|
|
|
##
|
|
# Image plugin for the GD uncompressed format. Note that this format
|
|
# is not supported by the standard <b>Image.open</b> function. To use
|
|
# this plugin, you have to import the <b>GdImageFile</b> module and
|
|
# use the <b>GdImageFile.open</b> function.
|
|
|
|
class GdImageFile(ImageFile.ImageFile):
|
|
|
|
format = "GD"
|
|
format_description = "GD uncompressed images"
|
|
|
|
def _open(self):
|
|
|
|
# Header
|
|
s = self.fp.read(775)
|
|
|
|
self.mode = "L" # FIXME: "P"
|
|
self.size = i16(s[0:2]), i16(s[2:4])
|
|
|
|
# transparency index
|
|
tindex = i16(s[5:7])
|
|
if tindex < 256:
|
|
self.info["transparent"] = tindex
|
|
|
|
self.palette = ImagePalette.raw("RGB", s[7:])
|
|
|
|
self.tile = [("raw", (0,0)+self.size, 775, ("L", 0, -1))]
|
|
|
|
##
|
|
# Load texture from a GD image file.
|
|
#
|
|
# @param filename GD file name, or an opened file handle.
|
|
# @param mode Optional mode. In this version, if the mode argument
|
|
# is given, it must be "r".
|
|
# @return An image instance.
|
|
# @exception IOError If the image could not be read.
|
|
|
|
def open(fp, mode = "r"):
|
|
|
|
if mode != "r":
|
|
raise ValueError("bad mode")
|
|
|
|
if isinstance(fp, str):
|
|
filename = fp
|
|
fp = builtins.open(fp, "rb")
|
|
else:
|
|
filename = ""
|
|
|
|
try:
|
|
return GdImageFile(fp, filename)
|
|
except SyntaxError:
|
|
raise IOError("cannot identify this image file")
|