2010-07-31 06:52:47 +04:00
|
|
|
#
|
|
|
|
# The Python Imaging Library.
|
|
|
|
# $Id$
|
|
|
|
#
|
|
|
|
# TIFF file handling
|
|
|
|
#
|
|
|
|
# TIFF is a flexible, if somewhat aged, image file format originally
|
|
|
|
# defined by Aldus. Although TIFF supports a wide variety of pixel
|
|
|
|
# layouts and compression methods, the name doesn't really stand for
|
|
|
|
# "thousands of incompatible file formats," it just feels that way.
|
|
|
|
#
|
|
|
|
# To read TIFF data from a stream, the stream must be seekable. For
|
|
|
|
# progressive decoding, make sure to use TIFF files where the tag
|
|
|
|
# directory is placed first in the file.
|
|
|
|
#
|
|
|
|
# History:
|
|
|
|
# 1995-09-01 fl Created
|
|
|
|
# 1996-05-04 fl Handle JPEGTABLES tag
|
|
|
|
# 1996-05-18 fl Fixed COLORMAP support
|
|
|
|
# 1997-01-05 fl Fixed PREDICTOR support
|
|
|
|
# 1997-08-27 fl Added support for rational tags (from Perry Stoll)
|
|
|
|
# 1998-01-10 fl Fixed seek/tell (from Jan Blom)
|
|
|
|
# 1998-07-15 fl Use private names for internal variables
|
|
|
|
# 1999-06-13 fl Rewritten for PIL 1.0 (1.0)
|
|
|
|
# 2000-10-11 fl Additional fixes for Python 2.0 (1.1)
|
|
|
|
# 2001-04-17 fl Fixed rewind support (seek to frame 0) (1.2)
|
|
|
|
# 2001-05-12 fl Added write support for more tags (from Greg Couch) (1.3)
|
|
|
|
# 2001-12-18 fl Added workaround for broken Matrox library
|
|
|
|
# 2002-01-18 fl Don't mess up if photometric tag is missing (D. Alan Stewart)
|
|
|
|
# 2003-05-19 fl Check FILLORDER tag
|
|
|
|
# 2003-09-26 fl Added RGBa support
|
|
|
|
# 2004-02-24 fl Added DPI support; fixed rational write support
|
|
|
|
# 2005-02-07 fl Added workaround for broken Corel Draw 10 files
|
|
|
|
# 2006-01-09 fl Added support for float/double tags (from Russell Nelson)
|
|
|
|
#
|
|
|
|
# Copyright (c) 1997-2006 by Secret Labs AB. All rights reserved.
|
|
|
|
# Copyright (c) 1995-1997 by Fredrik Lundh
|
|
|
|
#
|
|
|
|
# See the README file for information on usage and redistribution.
|
|
|
|
#
|
|
|
|
|
2012-10-16 06:27:35 +04:00
|
|
|
from __future__ import print_function
|
|
|
|
|
2010-07-31 06:52:47 +04:00
|
|
|
__version__ = "1.3.5"
|
|
|
|
|
2013-03-07 20:20:28 +04:00
|
|
|
from PIL import Image, ImageFile
|
|
|
|
from PIL import ImagePalette
|
|
|
|
from PIL import _binary
|
2010-07-31 06:52:47 +04:00
|
|
|
|
2012-10-11 02:11:13 +04:00
|
|
|
import array, sys
|
2012-10-16 01:19:55 +04:00
|
|
|
import collections
|
|
|
|
import itertools
|
2013-03-09 07:51:59 +04:00
|
|
|
import os
|
2010-07-31 06:52:47 +04:00
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
II = b"II" # little-endian (intel-style)
|
|
|
|
MM = b"MM" # big-endian (motorola-style)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
i8 = _binary.i8
|
|
|
|
o8 = _binary.o8
|
|
|
|
|
|
|
|
if sys.byteorder == "little":
|
|
|
|
native_prefix = II
|
|
|
|
else:
|
|
|
|
native_prefix = MM
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
#
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
# Read TIFF files
|
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
il16 = _binary.i16le
|
|
|
|
il32 = _binary.i32le
|
|
|
|
ol16 = _binary.o16le
|
|
|
|
ol32 = _binary.o32le
|
|
|
|
|
|
|
|
ib16 = _binary.i16be
|
|
|
|
ib32 = _binary.i32be
|
|
|
|
ob16 = _binary.o16be
|
|
|
|
ob32 = _binary.o32be
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# a few tag names, just to make the code below a bit more readable
|
|
|
|
IMAGEWIDTH = 256
|
|
|
|
IMAGELENGTH = 257
|
|
|
|
BITSPERSAMPLE = 258
|
|
|
|
COMPRESSION = 259
|
|
|
|
PHOTOMETRIC_INTERPRETATION = 262
|
|
|
|
FILLORDER = 266
|
|
|
|
IMAGEDESCRIPTION = 270
|
|
|
|
STRIPOFFSETS = 273
|
|
|
|
SAMPLESPERPIXEL = 277
|
|
|
|
ROWSPERSTRIP = 278
|
|
|
|
STRIPBYTECOUNTS = 279
|
|
|
|
X_RESOLUTION = 282
|
|
|
|
Y_RESOLUTION = 283
|
|
|
|
PLANAR_CONFIGURATION = 284
|
|
|
|
RESOLUTION_UNIT = 296
|
|
|
|
SOFTWARE = 305
|
|
|
|
DATE_TIME = 306
|
|
|
|
ARTIST = 315
|
|
|
|
PREDICTOR = 317
|
|
|
|
COLORMAP = 320
|
|
|
|
TILEOFFSETS = 324
|
|
|
|
EXTRASAMPLES = 338
|
|
|
|
SAMPLEFORMAT = 339
|
|
|
|
JPEGTABLES = 347
|
|
|
|
COPYRIGHT = 33432
|
|
|
|
IPTC_NAA_CHUNK = 33723 # newsphoto properties
|
|
|
|
PHOTOSHOP_CHUNK = 34377 # photoshop properties
|
|
|
|
ICCPROFILE = 34675
|
|
|
|
EXIFIFD = 34665
|
|
|
|
XMP = 700
|
|
|
|
|
|
|
|
COMPRESSION_INFO = {
|
|
|
|
# Compression => pil compression name
|
|
|
|
1: "raw",
|
|
|
|
2: "tiff_ccitt",
|
|
|
|
3: "group3",
|
|
|
|
4: "group4",
|
|
|
|
5: "tiff_lzw",
|
|
|
|
6: "tiff_jpeg", # obsolete
|
|
|
|
7: "jpeg",
|
|
|
|
32771: "tiff_raw_16", # 16-bit padding
|
|
|
|
32773: "packbits"
|
|
|
|
}
|
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
COMPRESSION_INFO_REV = dict([(v,k) for (k,v) in COMPRESSION_INFO.items()])
|
|
|
|
|
2010-07-31 06:52:47 +04:00
|
|
|
OPEN_INFO = {
|
|
|
|
# (ByteOrder, PhotoInterpretation, SampleFormat, FillOrder, BitsPerSample,
|
|
|
|
# ExtraSamples) => mode, rawmode
|
|
|
|
(II, 0, 1, 1, (1,), ()): ("1", "1;I"),
|
|
|
|
(II, 0, 1, 2, (1,), ()): ("1", "1;IR"),
|
|
|
|
(II, 0, 1, 1, (8,), ()): ("L", "L;I"),
|
|
|
|
(II, 0, 1, 2, (8,), ()): ("L", "L;IR"),
|
|
|
|
(II, 1, 1, 1, (1,), ()): ("1", "1"),
|
|
|
|
(II, 1, 1, 2, (1,), ()): ("1", "1;R"),
|
|
|
|
(II, 1, 1, 1, (8,), ()): ("L", "L"),
|
|
|
|
(II, 1, 1, 1, (8,8), (2,)): ("LA", "LA"),
|
|
|
|
(II, 1, 1, 2, (8,), ()): ("L", "L;R"),
|
|
|
|
(II, 1, 1, 1, (16,), ()): ("I;16", "I;16"),
|
|
|
|
(II, 1, 2, 1, (16,), ()): ("I;16S", "I;16S"),
|
|
|
|
(II, 1, 2, 1, (32,), ()): ("I", "I;32S"),
|
|
|
|
(II, 1, 3, 1, (32,), ()): ("F", "F;32F"),
|
|
|
|
(II, 2, 1, 1, (8,8,8), ()): ("RGB", "RGB"),
|
|
|
|
(II, 2, 1, 2, (8,8,8), ()): ("RGB", "RGB;R"),
|
|
|
|
(II, 2, 1, 1, (8,8,8,8), (0,)): ("RGBX", "RGBX"),
|
|
|
|
(II, 2, 1, 1, (8,8,8,8), (1,)): ("RGBA", "RGBa"),
|
|
|
|
(II, 2, 1, 1, (8,8,8,8), (2,)): ("RGBA", "RGBA"),
|
|
|
|
(II, 2, 1, 1, (8,8,8,8), (999,)): ("RGBA", "RGBA"), # corel draw 10
|
|
|
|
(II, 3, 1, 1, (1,), ()): ("P", "P;1"),
|
|
|
|
(II, 3, 1, 2, (1,), ()): ("P", "P;1R"),
|
|
|
|
(II, 3, 1, 1, (2,), ()): ("P", "P;2"),
|
|
|
|
(II, 3, 1, 2, (2,), ()): ("P", "P;2R"),
|
|
|
|
(II, 3, 1, 1, (4,), ()): ("P", "P;4"),
|
|
|
|
(II, 3, 1, 2, (4,), ()): ("P", "P;4R"),
|
|
|
|
(II, 3, 1, 1, (8,), ()): ("P", "P"),
|
|
|
|
(II, 3, 1, 1, (8,8), (2,)): ("PA", "PA"),
|
|
|
|
(II, 3, 1, 2, (8,), ()): ("P", "P;R"),
|
|
|
|
(II, 5, 1, 1, (8,8,8,8), ()): ("CMYK", "CMYK"),
|
|
|
|
(II, 6, 1, 1, (8,8,8), ()): ("YCbCr", "YCbCr"),
|
|
|
|
(II, 8, 1, 1, (8,8,8), ()): ("LAB", "LAB"),
|
|
|
|
|
|
|
|
(MM, 0, 1, 1, (1,), ()): ("1", "1;I"),
|
|
|
|
(MM, 0, 1, 2, (1,), ()): ("1", "1;IR"),
|
|
|
|
(MM, 0, 1, 1, (8,), ()): ("L", "L;I"),
|
|
|
|
(MM, 0, 1, 2, (8,), ()): ("L", "L;IR"),
|
|
|
|
(MM, 1, 1, 1, (1,), ()): ("1", "1"),
|
|
|
|
(MM, 1, 1, 2, (1,), ()): ("1", "1;R"),
|
|
|
|
(MM, 1, 1, 1, (8,), ()): ("L", "L"),
|
|
|
|
(MM, 1, 1, 1, (8,8), (2,)): ("LA", "LA"),
|
|
|
|
(MM, 1, 1, 2, (8,), ()): ("L", "L;R"),
|
|
|
|
(MM, 1, 1, 1, (16,), ()): ("I;16B", "I;16B"),
|
|
|
|
(MM, 1, 2, 1, (16,), ()): ("I;16BS", "I;16BS"),
|
|
|
|
(MM, 1, 2, 1, (32,), ()): ("I;32BS", "I;32BS"),
|
|
|
|
(MM, 1, 3, 1, (32,), ()): ("F;32BF", "F;32BF"),
|
|
|
|
(MM, 2, 1, 1, (8,8,8), ()): ("RGB", "RGB"),
|
|
|
|
(MM, 2, 1, 2, (8,8,8), ()): ("RGB", "RGB;R"),
|
|
|
|
(MM, 2, 1, 1, (8,8,8,8), (0,)): ("RGBX", "RGBX"),
|
|
|
|
(MM, 2, 1, 1, (8,8,8,8), (1,)): ("RGBA", "RGBa"),
|
|
|
|
(MM, 2, 1, 1, (8,8,8,8), (2,)): ("RGBA", "RGBA"),
|
|
|
|
(MM, 2, 1, 1, (8,8,8,8), (999,)): ("RGBA", "RGBA"), # corel draw 10
|
|
|
|
(MM, 3, 1, 1, (1,), ()): ("P", "P;1"),
|
|
|
|
(MM, 3, 1, 2, (1,), ()): ("P", "P;1R"),
|
|
|
|
(MM, 3, 1, 1, (2,), ()): ("P", "P;2"),
|
|
|
|
(MM, 3, 1, 2, (2,), ()): ("P", "P;2R"),
|
|
|
|
(MM, 3, 1, 1, (4,), ()): ("P", "P;4"),
|
|
|
|
(MM, 3, 1, 2, (4,), ()): ("P", "P;4R"),
|
|
|
|
(MM, 3, 1, 1, (8,), ()): ("P", "P"),
|
|
|
|
(MM, 3, 1, 1, (8,8), (2,)): ("PA", "PA"),
|
|
|
|
(MM, 3, 1, 2, (8,), ()): ("P", "P;R"),
|
|
|
|
(MM, 5, 1, 1, (8,8,8,8), ()): ("CMYK", "CMYK"),
|
|
|
|
(MM, 6, 1, 1, (8,8,8), ()): ("YCbCr", "YCbCr"),
|
|
|
|
(MM, 8, 1, 1, (8,8,8), ()): ("LAB", "LAB"),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
PREFIXES = [b"MM\000\052", b"II\052\000", b"II\xBC\000"]
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
def _accept(prefix):
|
|
|
|
return prefix[:4] in PREFIXES
|
|
|
|
|
|
|
|
##
|
|
|
|
# Wrapper for TIFF IFDs.
|
|
|
|
|
2012-10-16 01:19:55 +04:00
|
|
|
class ImageFileDirectory(collections.MutableMapping):
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# represents a TIFF tag directory. to speed things up,
|
|
|
|
# we don't decode tags unless they're asked for.
|
|
|
|
|
|
|
|
def __init__(self, prefix):
|
|
|
|
self.prefix = prefix[:2]
|
|
|
|
if self.prefix == MM:
|
|
|
|
self.i16, self.i32 = ib16, ib32
|
|
|
|
self.o16, self.o32 = ob16, ob32
|
|
|
|
elif self.prefix == II:
|
|
|
|
self.i16, self.i32 = il16, il32
|
|
|
|
self.o16, self.o32 = ol16, ol32
|
|
|
|
else:
|
|
|
|
raise SyntaxError("not a TIFF IFD")
|
|
|
|
self.reset()
|
|
|
|
|
|
|
|
def reset(self):
|
2013-03-07 15:59:52 +04:00
|
|
|
#: Tags is an incomplete dictionary of the tags of the image.
|
2013-03-07 17:52:44 +04:00
|
|
|
#: For a complete dictionary, use the as_dict method.
|
2010-07-31 06:52:47 +04:00
|
|
|
self.tags = {}
|
|
|
|
self.tagdata = {}
|
|
|
|
self.tagtype = {} # added 2008-06-05 by Florian Hoech
|
|
|
|
self.next = None
|
|
|
|
|
2013-03-07 15:59:52 +04:00
|
|
|
def __str__(self):
|
|
|
|
return str(self.as_dict())
|
|
|
|
|
|
|
|
def as_dict(self):
|
|
|
|
"""Return a dictionary of the image's tags."""
|
|
|
|
return dict(self.items())
|
|
|
|
|
|
|
|
def named(self):
|
|
|
|
"""Returns the complete tag dictionary, with named tags where posible."""
|
2013-03-07 20:20:28 +04:00
|
|
|
from PIL import TiffTags
|
2013-03-07 15:59:52 +04:00
|
|
|
result = {}
|
|
|
|
for tag_code, value in self.items():
|
|
|
|
tag_name = TiffTags.TAGS.get(tag_code, tag_code)
|
|
|
|
result[tag_name] = value
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
2012-10-16 01:19:55 +04:00
|
|
|
# dictionary API
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
def __len__(self):
|
|
|
|
return len(self.tagdata) + len(self.tags)
|
|
|
|
|
|
|
|
def __getitem__(self, tag):
|
|
|
|
try:
|
|
|
|
return self.tags[tag]
|
|
|
|
except KeyError:
|
|
|
|
type, data = self.tagdata[tag] # unpack on the fly
|
|
|
|
size, handler = self.load_dispatch[type]
|
|
|
|
self.tags[tag] = data = handler(self, data)
|
|
|
|
del self.tagdata[tag]
|
|
|
|
return data
|
|
|
|
|
|
|
|
def getscalar(self, tag, default=None):
|
|
|
|
try:
|
|
|
|
value = self[tag]
|
|
|
|
if len(value) != 1:
|
|
|
|
if tag == SAMPLEFORMAT:
|
|
|
|
# work around broken (?) matrox library
|
|
|
|
# (from Ted Wright, via Bob Klimek)
|
|
|
|
raise KeyError # use default
|
2012-10-11 07:52:53 +04:00
|
|
|
raise ValueError("not a scalar")
|
2010-07-31 06:52:47 +04:00
|
|
|
return value[0]
|
|
|
|
except KeyError:
|
|
|
|
if default is None:
|
|
|
|
raise
|
|
|
|
return default
|
|
|
|
|
2012-10-16 01:19:55 +04:00
|
|
|
def __contains__(self, tag):
|
|
|
|
return tag in self.tags or tag in self.tagdata
|
|
|
|
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
if bytes is str:
|
2012-10-16 01:19:55 +04:00
|
|
|
def has_key(self, tag):
|
|
|
|
return tag in self
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
def __setitem__(self, tag, value):
|
2012-10-16 01:19:55 +04:00
|
|
|
if not isinstance(value, tuple):
|
2010-07-31 06:52:47 +04:00
|
|
|
value = (value,)
|
|
|
|
self.tags[tag] = value
|
|
|
|
|
2012-10-16 01:19:55 +04:00
|
|
|
def __delitem__(self, tag):
|
|
|
|
self.tags.pop(tag, self.tagdata.pop(tag, None))
|
|
|
|
|
|
|
|
def __iter__(self):
|
|
|
|
return itertools.chain(self.tags.__iter__(), self.tagdata.__iter__())
|
|
|
|
|
2013-02-26 15:12:11 +04:00
|
|
|
def items(self):
|
|
|
|
keys = list(self.__iter__())
|
|
|
|
values = [self[key] for key in keys]
|
|
|
|
return zip(keys, values)
|
|
|
|
|
2010-07-31 06:52:47 +04:00
|
|
|
# load primitives
|
|
|
|
|
|
|
|
load_dispatch = {}
|
|
|
|
|
|
|
|
def load_byte(self, data):
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
return data
|
2010-07-31 06:52:47 +04:00
|
|
|
load_dispatch[1] = (1, load_byte)
|
|
|
|
|
|
|
|
def load_string(self, data):
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
if data[-1:] == b'\0':
|
2010-07-31 06:52:47 +04:00
|
|
|
data = data[:-1]
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
return data.decode('latin-1', 'replace')
|
2010-07-31 06:52:47 +04:00
|
|
|
load_dispatch[2] = (1, load_string)
|
|
|
|
|
|
|
|
def load_short(self, data):
|
|
|
|
l = []
|
|
|
|
for i in range(0, len(data), 2):
|
|
|
|
l.append(self.i16(data, i))
|
|
|
|
return tuple(l)
|
|
|
|
load_dispatch[3] = (2, load_short)
|
|
|
|
|
|
|
|
def load_long(self, data):
|
|
|
|
l = []
|
|
|
|
for i in range(0, len(data), 4):
|
|
|
|
l.append(self.i32(data, i))
|
|
|
|
return tuple(l)
|
|
|
|
load_dispatch[4] = (4, load_long)
|
|
|
|
|
|
|
|
def load_rational(self, data):
|
|
|
|
l = []
|
|
|
|
for i in range(0, len(data), 8):
|
|
|
|
l.append((self.i32(data, i), self.i32(data, i+4)))
|
|
|
|
return tuple(l)
|
|
|
|
load_dispatch[5] = (8, load_rational)
|
|
|
|
|
|
|
|
def load_float(self, data):
|
|
|
|
a = array.array("f", data)
|
|
|
|
if self.prefix != native_prefix:
|
|
|
|
a.byteswap()
|
|
|
|
return tuple(a)
|
|
|
|
load_dispatch[11] = (4, load_float)
|
|
|
|
|
|
|
|
def load_double(self, data):
|
|
|
|
a = array.array("d", data)
|
|
|
|
if self.prefix != native_prefix:
|
|
|
|
a.byteswap()
|
|
|
|
return tuple(a)
|
|
|
|
load_dispatch[12] = (8, load_double)
|
|
|
|
|
|
|
|
def load_undefined(self, data):
|
|
|
|
# Untyped data
|
|
|
|
return data
|
|
|
|
load_dispatch[7] = (1, load_undefined)
|
|
|
|
|
|
|
|
def load(self, fp):
|
|
|
|
# load tag dictionary
|
|
|
|
|
|
|
|
self.reset()
|
|
|
|
|
|
|
|
i16 = self.i16
|
|
|
|
i32 = self.i32
|
|
|
|
|
|
|
|
for i in range(i16(fp.read(2))):
|
|
|
|
|
|
|
|
ifd = fp.read(12)
|
|
|
|
|
|
|
|
tag, typ = i16(ifd), i16(ifd, 2)
|
|
|
|
|
|
|
|
if Image.DEBUG:
|
2013-03-07 20:20:28 +04:00
|
|
|
from PIL import TiffTags
|
2010-07-31 06:52:47 +04:00
|
|
|
tagname = TiffTags.TAGS.get(tag, "unknown")
|
|
|
|
typname = TiffTags.TYPES.get(typ, "unknown")
|
2012-10-16 06:27:35 +04:00
|
|
|
print("tag: %s (%d)" % (tagname, tag), end=' ')
|
|
|
|
print("- type: %s (%d)" % (typname, typ), end=' ')
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
try:
|
|
|
|
dispatch = self.load_dispatch[typ]
|
|
|
|
except KeyError:
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- unsupported type", typ)
|
2010-07-31 06:52:47 +04:00
|
|
|
continue # ignore unsupported type
|
|
|
|
|
|
|
|
size, handler = dispatch
|
|
|
|
|
|
|
|
size = size * i32(ifd, 4)
|
|
|
|
|
|
|
|
# Get and expand tag value
|
|
|
|
if size > 4:
|
|
|
|
here = fp.tell()
|
|
|
|
fp.seek(i32(ifd, 8))
|
|
|
|
data = ImageFile._safe_read(fp, size)
|
|
|
|
fp.seek(here)
|
|
|
|
else:
|
|
|
|
data = ifd[8:8+size]
|
|
|
|
|
|
|
|
if len(data) != size:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise IOError("not enough data")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
self.tagdata[tag] = typ, data
|
|
|
|
self.tagtype[tag] = typ
|
|
|
|
|
|
|
|
if Image.DEBUG:
|
|
|
|
if tag in (COLORMAP, IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK, ICCPROFILE, XMP):
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- value: <table: %d bytes>" % size)
|
2010-07-31 06:52:47 +04:00
|
|
|
else:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- value:", self[tag])
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
self.next = i32(fp.read(4))
|
|
|
|
|
|
|
|
# save primitives
|
|
|
|
|
|
|
|
def save(self, fp):
|
|
|
|
|
|
|
|
o16 = self.o16
|
|
|
|
o32 = self.o32
|
|
|
|
|
|
|
|
fp.write(o16(len(self.tags)))
|
|
|
|
|
|
|
|
# always write in ascending tag order
|
2012-10-17 07:39:56 +04:00
|
|
|
tags = sorted(self.tags.items())
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
directory = []
|
|
|
|
append = directory.append
|
|
|
|
|
|
|
|
offset = fp.tell() + len(self.tags) * 12 + 4
|
|
|
|
|
|
|
|
stripoffsets = None
|
|
|
|
|
|
|
|
# pass 1: convert tags to binary format
|
|
|
|
for tag, value in tags:
|
|
|
|
|
|
|
|
typ = None
|
|
|
|
|
2012-10-16 01:18:27 +04:00
|
|
|
if tag in self.tagtype:
|
2010-07-31 06:52:47 +04:00
|
|
|
typ = self.tagtype[tag]
|
|
|
|
|
|
|
|
if typ == 1:
|
|
|
|
# byte data
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
data = value
|
2010-07-31 06:52:47 +04:00
|
|
|
elif typ == 7:
|
|
|
|
# untyped data
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
data = value = b"".join(value)
|
2012-10-17 07:39:56 +04:00
|
|
|
elif isinstance(value[0], str):
|
2010-07-31 06:52:47 +04:00
|
|
|
# string data
|
|
|
|
typ = 2
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
data = value = b"\0".join(value.encode('ascii', 'replace')) + b"\0"
|
2010-07-31 06:52:47 +04:00
|
|
|
else:
|
|
|
|
# integer data
|
|
|
|
if tag == STRIPOFFSETS:
|
|
|
|
stripoffsets = len(directory)
|
|
|
|
typ = 4 # to avoid catch-22
|
|
|
|
elif tag in (X_RESOLUTION, Y_RESOLUTION):
|
|
|
|
# identify rational data fields
|
|
|
|
typ = 5
|
|
|
|
elif not typ:
|
|
|
|
typ = 3
|
|
|
|
for v in value:
|
|
|
|
if v >= 65536:
|
|
|
|
typ = 4
|
|
|
|
if typ == 3:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
data = b"".join(map(o16, value))
|
2010-07-31 06:52:47 +04:00
|
|
|
else:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
data = b"".join(map(o32, value))
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
if Image.DEBUG:
|
2013-03-07 20:20:28 +04:00
|
|
|
from PIL import TiffTags
|
2010-07-31 06:52:47 +04:00
|
|
|
tagname = TiffTags.TAGS.get(tag, "unknown")
|
|
|
|
typname = TiffTags.TYPES.get(typ, "unknown")
|
2012-10-16 06:27:35 +04:00
|
|
|
print("save: %s (%d)" % (tagname, tag), end=' ')
|
|
|
|
print("- type: %s (%d)" % (typname, typ), end=' ')
|
2010-07-31 06:52:47 +04:00
|
|
|
if tag in (COLORMAP, IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK, ICCPROFILE, XMP):
|
|
|
|
size = len(data)
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- value: <table: %d bytes>" % size)
|
2010-07-31 06:52:47 +04:00
|
|
|
else:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- value:", value)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# figure out if data fits into the directory
|
|
|
|
if len(data) == 4:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
append((tag, typ, len(value), data, b""))
|
2010-07-31 06:52:47 +04:00
|
|
|
elif len(data) < 4:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
append((tag, typ, len(value), data + (4-len(data))*b"\0", b""))
|
2010-07-31 06:52:47 +04:00
|
|
|
else:
|
|
|
|
count = len(value)
|
|
|
|
if typ == 5:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
count = count // 2 # adjust for rational data field
|
2010-07-31 06:52:47 +04:00
|
|
|
append((tag, typ, count, o32(offset), data))
|
|
|
|
offset = offset + len(data)
|
|
|
|
if offset & 1:
|
|
|
|
offset = offset + 1 # word padding
|
|
|
|
|
|
|
|
# update strip offset data to point beyond auxiliary data
|
|
|
|
if stripoffsets is not None:
|
|
|
|
tag, typ, count, value, data = directory[stripoffsets]
|
|
|
|
assert not data, "multistrip support not yet implemented"
|
|
|
|
value = o32(self.i32(value) + offset)
|
|
|
|
directory[stripoffsets] = tag, typ, count, value, data
|
|
|
|
|
|
|
|
# pass 2: write directory to file
|
|
|
|
for tag, typ, count, value, data in directory:
|
|
|
|
if Image.DEBUG > 1:
|
2012-10-16 06:27:35 +04:00
|
|
|
print(tag, typ, count, repr(value), repr(data))
|
2010-07-31 06:52:47 +04:00
|
|
|
fp.write(o16(tag) + o16(typ) + o32(count) + value)
|
|
|
|
|
|
|
|
# -- overwrite here for multi-page --
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
fp.write(b"\0\0\0\0") # end of directory
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# pass 3: write auxiliary data to file
|
|
|
|
for tag, typ, count, value, data in directory:
|
|
|
|
fp.write(data)
|
|
|
|
if len(data) & 1:
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
fp.write(b"\0")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
return offset
|
|
|
|
|
|
|
|
##
|
|
|
|
# Image plugin for TIFF files.
|
|
|
|
|
|
|
|
class TiffImageFile(ImageFile.ImageFile):
|
|
|
|
|
|
|
|
format = "TIFF"
|
|
|
|
format_description = "Adobe TIFF"
|
|
|
|
|
|
|
|
def _open(self):
|
|
|
|
"Open the first image in a TIFF file"
|
|
|
|
|
|
|
|
# Header
|
|
|
|
ifh = self.fp.read(8)
|
|
|
|
|
|
|
|
if ifh[:4] not in PREFIXES:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise SyntaxError("not a TIFF file")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# image file directory (tag dictionary)
|
|
|
|
self.tag = self.ifd = ImageFileDirectory(ifh[:2])
|
|
|
|
|
|
|
|
# setup frame pointers
|
|
|
|
self.__first = self.__next = self.ifd.i32(ifh, 4)
|
|
|
|
self.__frame = -1
|
|
|
|
self.__fp = self.fp
|
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print ("*** TiffImageFile._open ***")
|
|
|
|
print ("- __first:", self.__first)
|
|
|
|
print ("- ifh: ", ifh)
|
2013-03-09 07:51:59 +04:00
|
|
|
|
|
|
|
# and load the first frame
|
2010-07-31 06:52:47 +04:00
|
|
|
self._seek(0)
|
|
|
|
|
|
|
|
def seek(self, frame):
|
|
|
|
"Select a given frame as current image"
|
|
|
|
|
|
|
|
if frame < 0:
|
|
|
|
frame = 0
|
|
|
|
self._seek(frame)
|
|
|
|
|
|
|
|
def tell(self):
|
|
|
|
"Return the current frame number"
|
|
|
|
|
|
|
|
return self._tell()
|
|
|
|
|
|
|
|
def _seek(self, frame):
|
|
|
|
|
|
|
|
self.fp = self.__fp
|
|
|
|
if frame < self.__frame:
|
|
|
|
# rewind file
|
|
|
|
self.__frame = -1
|
|
|
|
self.__next = self.__first
|
|
|
|
while self.__frame < frame:
|
|
|
|
if not self.__next:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise EOFError("no more images in TIFF file")
|
2010-07-31 06:52:47 +04:00
|
|
|
self.fp.seek(self.__next)
|
|
|
|
self.tag.load(self.fp)
|
|
|
|
self.__next = self.tag.next
|
|
|
|
self.__frame = self.__frame + 1
|
|
|
|
self._setup()
|
|
|
|
|
|
|
|
def _tell(self):
|
|
|
|
|
|
|
|
return self.__frame
|
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
def _decoder(self, rawmode, layer, tile=None):
|
2010-07-31 06:52:47 +04:00
|
|
|
"Setup decoder contexts"
|
|
|
|
|
|
|
|
args = None
|
|
|
|
if rawmode == "RGB" and self._planar_configuration == 2:
|
|
|
|
rawmode = rawmode[layer]
|
|
|
|
compression = self._compression
|
|
|
|
if compression == "raw":
|
|
|
|
args = (rawmode, 0, 1)
|
|
|
|
elif compression == "jpeg":
|
|
|
|
args = rawmode, ""
|
2012-10-16 01:18:27 +04:00
|
|
|
if JPEGTABLES in self.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
# Hack to handle abbreviated JPEG headers
|
|
|
|
self.tile_prefix = self.tag[JPEGTABLES]
|
|
|
|
elif compression == "packbits":
|
|
|
|
args = rawmode
|
|
|
|
elif compression == "tiff_lzw":
|
|
|
|
args = rawmode
|
2012-10-16 01:18:27 +04:00
|
|
|
if 317 in self.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
# Section 14: Differencing Predictor
|
|
|
|
self.decoderconfig = (self.tag[PREDICTOR][0],)
|
|
|
|
|
2012-10-16 01:18:27 +04:00
|
|
|
if ICCPROFILE in self.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
self.info['icc_profile'] = self.tag[ICCPROFILE]
|
|
|
|
|
|
|
|
return args
|
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
def _load_libtiff(self):
|
|
|
|
""" Overload method triggered when we detect a g3/g4 tiff
|
|
|
|
Calls out to lib tiff """
|
|
|
|
|
|
|
|
pixel = Image.Image.load(self)
|
|
|
|
|
|
|
|
if self.tile is None:
|
|
|
|
raise IOError("cannot load this image")
|
|
|
|
if not self.tile:
|
|
|
|
return pixel
|
|
|
|
|
|
|
|
self.load_prepare()
|
|
|
|
|
|
|
|
if not len(self.tile) == 1:
|
|
|
|
raise IOError("Not exactly one tile")
|
|
|
|
|
|
|
|
d, e, o, a = self.tile[0]
|
|
|
|
d = Image._getdecoder(self.mode, d, a, self.decoderconfig)
|
|
|
|
try:
|
|
|
|
d.setimage(self.im, e)
|
|
|
|
except ValueError:
|
|
|
|
raise IOError("Couldn't set the image")
|
|
|
|
|
|
|
|
if hasattr(self.fp, "fileno"):
|
|
|
|
# we've got a actual file on disk, pass in the fp.
|
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print ("have fileno, calling fileno version of the decoder.")
|
2013-03-09 07:51:59 +04:00
|
|
|
self.fp.seek(0)
|
|
|
|
n,e = d.decode("fpfp") # 4 bytes, otherwise the trace might error out
|
|
|
|
elif hasattr(self.fp, "getvalue"):
|
|
|
|
# We've got a stringio like thing passed in. Yay for all in memory.
|
|
|
|
# The decoder needs the entire file in one shot, so there's not
|
|
|
|
# a lot we can do here other than give it the entire file.
|
|
|
|
# unless we could do something like get the address of the underlying
|
|
|
|
# string for stringio.
|
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print ("have getvalue. just sending in a string from getvalue")
|
2013-03-09 07:51:59 +04:00
|
|
|
n,e = d.decode(self.fp.getvalue())
|
|
|
|
else:
|
|
|
|
# we have something else.
|
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print ("don't have fileno or getvalue. just reading")
|
2013-03-09 07:51:59 +04:00
|
|
|
# UNDONE -- so much for that buffer size thing.
|
|
|
|
n, e = d.decode(self.fp.read())
|
|
|
|
|
|
|
|
|
|
|
|
self.tile = []
|
|
|
|
self.readonly = 0
|
|
|
|
self.fp = None # might be shared
|
|
|
|
|
|
|
|
if e < 0:
|
2013-03-12 09:04:34 +04:00
|
|
|
raise IOError(e)
|
2013-03-09 07:51:59 +04:00
|
|
|
|
|
|
|
self.load_end()
|
|
|
|
|
|
|
|
return Image.Image.load(self)
|
|
|
|
|
2010-07-31 06:52:47 +04:00
|
|
|
def _setup(self):
|
|
|
|
"Setup this image object based on current tags"
|
|
|
|
|
2012-10-16 01:18:27 +04:00
|
|
|
if 0xBC01 in self.tag:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise IOError("Windows Media Photo files not yet supported")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
getscalar = self.tag.getscalar
|
|
|
|
|
|
|
|
# extract relevant tags
|
|
|
|
self._compression = COMPRESSION_INFO[getscalar(COMPRESSION, 1)]
|
|
|
|
self._planar_configuration = getscalar(PLANAR_CONFIGURATION, 1)
|
|
|
|
|
|
|
|
# photometric is a required tag, but not everyone is reading
|
|
|
|
# the specification
|
|
|
|
photo = getscalar(PHOTOMETRIC_INTERPRETATION, 0)
|
|
|
|
|
|
|
|
fillorder = getscalar(FILLORDER, 1)
|
|
|
|
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("*** Summary ***")
|
|
|
|
print("- compression:", self._compression)
|
|
|
|
print("- photometric_interpretation:", photo)
|
|
|
|
print("- planar_configuration:", self._planar_configuration)
|
|
|
|
print("- fill_order:", fillorder)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# size
|
|
|
|
xsize = getscalar(IMAGEWIDTH)
|
|
|
|
ysize = getscalar(IMAGELENGTH)
|
|
|
|
self.size = xsize, ysize
|
|
|
|
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- size:", self.size)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
format = getscalar(SAMPLEFORMAT, 1)
|
|
|
|
|
|
|
|
# mode: check photometric interpretation and bits per pixel
|
|
|
|
key = (
|
|
|
|
self.tag.prefix, photo, format, fillorder,
|
|
|
|
self.tag.get(BITSPERSAMPLE, (1,)),
|
|
|
|
self.tag.get(EXTRASAMPLES, ())
|
|
|
|
)
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("format key:", key)
|
2010-07-31 06:52:47 +04:00
|
|
|
try:
|
|
|
|
self.mode, rawmode = OPEN_INFO[key]
|
|
|
|
except KeyError:
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- unsupported format")
|
2012-10-11 07:52:53 +04:00
|
|
|
raise SyntaxError("unknown pixel mode")
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- raw mode:", rawmode)
|
|
|
|
print("- pil mode:", self.mode)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
self.info["compression"] = self._compression
|
|
|
|
|
|
|
|
xres = getscalar(X_RESOLUTION, (1, 1))
|
|
|
|
yres = getscalar(Y_RESOLUTION, (1, 1))
|
|
|
|
|
|
|
|
if xres and yres:
|
|
|
|
xres = xres[0] / (xres[1] or 1)
|
|
|
|
yres = yres[0] / (yres[1] or 1)
|
|
|
|
resunit = getscalar(RESOLUTION_UNIT, 1)
|
|
|
|
if resunit == 2: # dots per inch
|
|
|
|
self.info["dpi"] = xres, yres
|
|
|
|
elif resunit == 3: # dots per centimeter. convert to dpi
|
|
|
|
self.info["dpi"] = xres * 2.54, yres * 2.54
|
|
|
|
else: # No absolute unit of measurement
|
|
|
|
self.info["resolution"] = xres, yres
|
|
|
|
|
|
|
|
# build tile descriptors
|
|
|
|
x = y = l = 0
|
|
|
|
self.tile = []
|
2012-10-16 01:18:27 +04:00
|
|
|
if STRIPOFFSETS in self.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
# striped image
|
2013-03-09 07:51:59 +04:00
|
|
|
offsets = self.tag[STRIPOFFSETS]
|
2010-07-31 06:52:47 +04:00
|
|
|
h = getscalar(ROWSPERSTRIP, ysize)
|
|
|
|
w = self.size[0]
|
2013-03-09 07:51:59 +04:00
|
|
|
if self._compression in ["tiff_ccitt", "group3",
|
|
|
|
"group4", "tiff_raw_16"]:
|
2013-03-09 09:15:22 +04:00
|
|
|
## if Image.DEBUG:
|
|
|
|
## print "Activating g4 compression for whole file"
|
2013-03-09 07:51:59 +04:00
|
|
|
|
|
|
|
# Decoder expects entire file as one tile.
|
|
|
|
# There's a buffer size limit in load (64k)
|
|
|
|
# so large g4 images will fail if we use that
|
|
|
|
# function.
|
|
|
|
#
|
|
|
|
# Setup the one tile for the whole image, then
|
|
|
|
# replace the existing load function with our
|
|
|
|
# _load_libtiff function.
|
|
|
|
|
|
|
|
self.load = self._load_libtiff
|
|
|
|
|
|
|
|
# To be nice on memory footprint, if there's a
|
|
|
|
# file descriptor, use that instead of reading
|
|
|
|
# into a string in python.
|
|
|
|
|
|
|
|
# libtiff closes the file descriptor, so pass in a dup.
|
|
|
|
fp = hasattr(self.fp, "fileno") and os.dup(self.fp.fileno())
|
|
|
|
|
|
|
|
# Offset in the tile tuple is 0, we go from 0,0 to
|
|
|
|
# w,h, and we only do this once -- eds
|
|
|
|
a = (rawmode, self._compression, fp )
|
2010-07-31 06:52:47 +04:00
|
|
|
self.tile.append(
|
|
|
|
(self._compression,
|
2013-03-09 07:51:59 +04:00
|
|
|
(0, 0, w, ysize),
|
|
|
|
0, a))
|
|
|
|
a = None
|
|
|
|
|
|
|
|
else:
|
|
|
|
for i in range(len(offsets)):
|
|
|
|
a = self._decoder(rawmode, l, i)
|
|
|
|
self.tile.append(
|
|
|
|
(self._compression,
|
|
|
|
(0, min(y, ysize), w, min(y+h, ysize)),
|
|
|
|
offsets[i], a))
|
2013-03-09 09:15:22 +04:00
|
|
|
if Image.DEBUG:
|
|
|
|
print ("tiles: ", self.tile)
|
2013-03-09 07:51:59 +04:00
|
|
|
y = y + h
|
|
|
|
if y >= self.size[1]:
|
|
|
|
x = y = 0
|
|
|
|
l = l + 1
|
2010-07-31 06:52:47 +04:00
|
|
|
a = None
|
2012-10-16 01:18:27 +04:00
|
|
|
elif TILEOFFSETS in self.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
# tiled image
|
|
|
|
w = getscalar(322)
|
|
|
|
h = getscalar(323)
|
|
|
|
a = None
|
|
|
|
for o in self.tag[TILEOFFSETS]:
|
|
|
|
if not a:
|
|
|
|
a = self._decoder(rawmode, l)
|
|
|
|
# FIXME: this doesn't work if the image size
|
|
|
|
# is not a multiple of the tile size...
|
|
|
|
self.tile.append(
|
|
|
|
(self._compression,
|
|
|
|
(x, y, x+w, y+h),
|
|
|
|
o, a))
|
|
|
|
x = x + w
|
|
|
|
if x >= self.size[0]:
|
|
|
|
x, y = 0, y + h
|
|
|
|
if y >= self.size[1]:
|
|
|
|
x = y = 0
|
|
|
|
l = l + 1
|
|
|
|
a = None
|
|
|
|
else:
|
|
|
|
if Image.DEBUG:
|
2012-10-16 06:27:35 +04:00
|
|
|
print("- unsupported data organization")
|
2010-07-31 06:52:47 +04:00
|
|
|
raise SyntaxError("unknown data organization")
|
|
|
|
|
|
|
|
# fixup palette descriptor
|
|
|
|
|
|
|
|
if self.mode == "P":
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
palette = [o8(a // 256) for a in self.tag[COLORMAP]]
|
|
|
|
self.palette = ImagePalette.raw("RGB;L", b"".join(palette))
|
2010-07-31 06:52:47 +04:00
|
|
|
#
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
# Write TIFF files
|
|
|
|
|
|
|
|
# little endian is default except for image modes with explict big endian byte-order
|
|
|
|
|
|
|
|
SAVE_INFO = {
|
|
|
|
# mode => rawmode, byteorder, photometrics, sampleformat, bitspersample, extra
|
|
|
|
"1": ("1", II, 1, 1, (1,), None),
|
|
|
|
"L": ("L", II, 1, 1, (8,), None),
|
|
|
|
"LA": ("LA", II, 1, 1, (8,8), 2),
|
|
|
|
"P": ("P", II, 3, 1, (8,), None),
|
|
|
|
"PA": ("PA", II, 3, 1, (8,8), 2),
|
|
|
|
"I": ("I;32S", II, 1, 2, (32,), None),
|
|
|
|
"I;16": ("I;16", II, 1, 1, (16,), None),
|
|
|
|
"I;16S": ("I;16S", II, 1, 2, (16,), None),
|
|
|
|
"F": ("F;32F", II, 1, 3, (32,), None),
|
|
|
|
"RGB": ("RGB", II, 2, 1, (8,8,8), None),
|
|
|
|
"RGBX": ("RGBX", II, 2, 1, (8,8,8,8), 0),
|
|
|
|
"RGBA": ("RGBA", II, 2, 1, (8,8,8,8), 2),
|
|
|
|
"CMYK": ("CMYK", II, 5, 1, (8,8,8,8), None),
|
|
|
|
"YCbCr": ("YCbCr", II, 6, 1, (8,8,8), None),
|
|
|
|
"LAB": ("LAB", II, 8, 1, (8,8,8), None),
|
|
|
|
|
|
|
|
"I;32BS": ("I;32BS", MM, 1, 2, (32,), None),
|
|
|
|
"I;16B": ("I;16B", MM, 1, 1, (16,), None),
|
|
|
|
"I;16BS": ("I;16BS", MM, 1, 2, (16,), None),
|
|
|
|
"F;32BF": ("F;32BF", MM, 1, 3, (32,), None),
|
|
|
|
}
|
|
|
|
|
|
|
|
def _cvt_res(value):
|
|
|
|
# convert value to TIFF rational number -- (numerator, denominator)
|
2012-10-17 07:39:56 +04:00
|
|
|
if isinstance(value, collections.Sequence):
|
2010-07-31 06:52:47 +04:00
|
|
|
assert(len(value) % 2 == 0)
|
|
|
|
return value
|
2012-10-17 07:39:56 +04:00
|
|
|
if isinstance(value, int):
|
2010-07-31 06:52:47 +04:00
|
|
|
return (value, 1)
|
|
|
|
value = float(value)
|
|
|
|
return (int(value * 65536), 65536)
|
|
|
|
|
|
|
|
def _save(im, fp, filename):
|
|
|
|
|
|
|
|
try:
|
|
|
|
rawmode, prefix, photo, format, bits, extra = SAVE_INFO[im.mode]
|
|
|
|
except KeyError:
|
2012-10-11 07:52:53 +04:00
|
|
|
raise IOError("cannot write mode %s as TIFF" % im.mode)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
ifd = ImageFileDirectory(prefix)
|
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
compression = im.info.get('compression','raw')
|
|
|
|
libtiff = compression in ["tiff_ccitt", "group3",
|
|
|
|
"group4", "tiff_raw_16"]
|
|
|
|
|
2010-07-31 06:52:47 +04:00
|
|
|
# -- multi-page -- skip TIFF header on subsequent pages
|
2013-03-09 07:51:59 +04:00
|
|
|
if not libtiff and fp.tell() == 0:
|
2010-07-31 06:52:47 +04:00
|
|
|
# tiff header (write via IFD to get everything right)
|
|
|
|
# PIL always starts the first IFD at offset 8
|
|
|
|
fp.write(ifd.prefix + ifd.o16(42) + ifd.o32(8))
|
|
|
|
|
|
|
|
ifd[IMAGEWIDTH] = im.size[0]
|
|
|
|
ifd[IMAGELENGTH] = im.size[1]
|
|
|
|
|
|
|
|
# additions written by Greg Couch, gregc@cgl.ucsf.edu
|
|
|
|
# inspired by image-sig posting from Kevin Cazabon, kcazabon@home.com
|
|
|
|
if hasattr(im, 'tag'):
|
|
|
|
# preserve tags from original TIFF image file
|
|
|
|
for key in (RESOLUTION_UNIT, X_RESOLUTION, Y_RESOLUTION):
|
2012-10-16 01:18:27 +04:00
|
|
|
if key in im.tag.tagdata:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[key] = im.tag.tagdata.get(key)
|
|
|
|
# preserve some more tags from original TIFF image file
|
|
|
|
# -- 2008-06-06 Florian Hoech
|
|
|
|
ifd.tagtype = im.tag.tagtype
|
|
|
|
for key in (IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK, XMP):
|
2012-10-16 01:18:27 +04:00
|
|
|
if key in im.tag:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[key] = im.tag[key]
|
|
|
|
# preserve ICC profile (should also work when saving other formats
|
|
|
|
# which support profiles as TIFF) -- 2008-06-06 Florian Hoech
|
2012-10-16 01:18:27 +04:00
|
|
|
if "icc_profile" in im.info:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[ICCPROFILE] = im.info["icc_profile"]
|
2012-10-16 01:18:27 +04:00
|
|
|
if "description" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[IMAGEDESCRIPTION] = im.encoderinfo["description"]
|
2012-10-16 01:18:27 +04:00
|
|
|
if "resolution" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[X_RESOLUTION] = ifd[Y_RESOLUTION] \
|
|
|
|
= _cvt_res(im.encoderinfo["resolution"])
|
2012-10-16 01:18:27 +04:00
|
|
|
if "x resolution" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[X_RESOLUTION] = _cvt_res(im.encoderinfo["x resolution"])
|
2012-10-16 01:18:27 +04:00
|
|
|
if "y resolution" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[Y_RESOLUTION] = _cvt_res(im.encoderinfo["y resolution"])
|
2012-10-16 01:18:27 +04:00
|
|
|
if "resolution unit" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
unit = im.encoderinfo["resolution unit"]
|
|
|
|
if unit == "inch":
|
|
|
|
ifd[RESOLUTION_UNIT] = 2
|
|
|
|
elif unit == "cm" or unit == "centimeter":
|
|
|
|
ifd[RESOLUTION_UNIT] = 3
|
|
|
|
else:
|
|
|
|
ifd[RESOLUTION_UNIT] = 1
|
2012-10-16 01:18:27 +04:00
|
|
|
if "software" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[SOFTWARE] = im.encoderinfo["software"]
|
2012-10-16 01:18:27 +04:00
|
|
|
if "date time" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[DATE_TIME] = im.encoderinfo["date time"]
|
2012-10-16 01:18:27 +04:00
|
|
|
if "artist" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[ARTIST] = im.encoderinfo["artist"]
|
2012-10-16 01:18:27 +04:00
|
|
|
if "copyright" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[COPYRIGHT] = im.encoderinfo["copyright"]
|
|
|
|
|
|
|
|
dpi = im.encoderinfo.get("dpi")
|
|
|
|
if dpi:
|
|
|
|
ifd[RESOLUTION_UNIT] = 2
|
|
|
|
ifd[X_RESOLUTION] = _cvt_res(dpi[0])
|
|
|
|
ifd[Y_RESOLUTION] = _cvt_res(dpi[1])
|
|
|
|
|
|
|
|
if bits != (1,):
|
|
|
|
ifd[BITSPERSAMPLE] = bits
|
|
|
|
if len(bits) != 1:
|
|
|
|
ifd[SAMPLESPERPIXEL] = len(bits)
|
|
|
|
if extra is not None:
|
|
|
|
ifd[EXTRASAMPLES] = extra
|
|
|
|
if format != 1:
|
|
|
|
ifd[SAMPLEFORMAT] = format
|
|
|
|
|
|
|
|
ifd[PHOTOMETRIC_INTERPRETATION] = photo
|
|
|
|
|
|
|
|
if im.mode == "P":
|
|
|
|
lut = im.im.getpalette("RGB", "RGB;L")
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
ifd[COLORMAP] = tuple(i8(v) * 256 for v in lut)
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
# data orientation
|
py3k: The big push
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.
2012-10-21 01:01:53 +04:00
|
|
|
stride = len(bits) * ((im.size[0]*bits[0]+7)//8)
|
2010-07-31 06:52:47 +04:00
|
|
|
ifd[ROWSPERSTRIP] = im.size[1]
|
|
|
|
ifd[STRIPBYTECOUNTS] = stride * im.size[1]
|
|
|
|
ifd[STRIPOFFSETS] = 0 # this is adjusted by IFD writer
|
2013-03-09 07:51:59 +04:00
|
|
|
ifd[COMPRESSION] = COMPRESSION_INFO_REV.get(compression,1) # no compression by default
|
2010-07-31 06:52:47 +04:00
|
|
|
|
2013-03-09 07:51:59 +04:00
|
|
|
if libtiff:
|
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print ("Saving using libtiff encoder")
|
|
|
|
print (ifd.items())
|
2013-03-09 07:51:59 +04:00
|
|
|
_fp = 0
|
|
|
|
if hasattr(fp, "fileno"):
|
|
|
|
fp.seek(0)
|
|
|
|
_fp = os.dup(fp.fileno())
|
|
|
|
|
|
|
|
blocklist = [STRIPOFFSETS, STRIPBYTECOUNTS, ROWSPERSTRIP, ICCPROFILE] # ICC Profile crashes.
|
|
|
|
atts = dict([(k,v) for (k,(v,)) in ifd.items() if k not in blocklist])
|
|
|
|
try:
|
|
|
|
# pull in more bits from the original file, e.g x,y resolution
|
|
|
|
# so that we can save(load('')) == original file.
|
|
|
|
for k,v in im.ifd.items():
|
|
|
|
if k not in atts and k not in blocklist:
|
|
|
|
if type(v[0]) == tuple and len(v) > 1:
|
|
|
|
# A tuple of more than one rational tuples
|
|
|
|
# flatten to floats, following tiffcp.c->cpTag->TIFF_RATIONAL
|
|
|
|
atts[k] = [float(elt[0])/float(elt[1]) for elt in v]
|
|
|
|
continue
|
|
|
|
if type(v[0]) == tuple and len(v) == 1:
|
|
|
|
# A tuple of one rational tuples
|
|
|
|
# flatten to floats, following tiffcp.c->cpTag->TIFF_RATIONAL
|
|
|
|
atts[k] = float(v[0][0])/float(v[0][1])
|
|
|
|
continue
|
|
|
|
if type(v) == tuple and len(v) == 1:
|
|
|
|
# int or similar
|
|
|
|
atts[k] = v[0]
|
|
|
|
continue
|
|
|
|
if type(v) == str:
|
|
|
|
atts[k] = v
|
|
|
|
continue
|
|
|
|
|
|
|
|
except:
|
|
|
|
# if we don't have an ifd here, just punt.
|
|
|
|
pass
|
|
|
|
if Image.DEBUG:
|
2013-03-09 09:15:22 +04:00
|
|
|
print (atts)
|
2013-03-09 07:51:59 +04:00
|
|
|
a = (rawmode, compression, _fp, filename, atts)
|
|
|
|
e = Image._getencoder(im.mode, compression, a, im.encoderconfig)
|
|
|
|
e.setimage(im.im, (0,0)+im.size)
|
|
|
|
while 1:
|
|
|
|
l, s, d = e.encode(16*1024) # undone, change to self.decodermaxblock
|
|
|
|
if not _fp:
|
|
|
|
fp.write(d)
|
|
|
|
if s:
|
|
|
|
break
|
|
|
|
if s < 0:
|
|
|
|
raise IOError("encoder error %d when writing image file" % s)
|
|
|
|
|
|
|
|
else:
|
|
|
|
offset = ifd.save(fp)
|
|
|
|
|
|
|
|
ImageFile._save(im, fp, [
|
|
|
|
("raw", (0,0)+im.size, offset, (rawmode, stride, 1))
|
|
|
|
])
|
2010-07-31 06:52:47 +04:00
|
|
|
|
|
|
|
|
|
|
|
# -- helper for multi-page save --
|
2012-10-16 01:18:27 +04:00
|
|
|
if "_debug_multipage" in im.encoderinfo:
|
2010-07-31 06:52:47 +04:00
|
|
|
#just to access o32 and o16 (using correct byte order)
|
|
|
|
im._debug_multipage = ifd
|
|
|
|
|
|
|
|
#
|
|
|
|
# --------------------------------------------------------------------
|
|
|
|
# Register
|
|
|
|
|
|
|
|
Image.register_open("TIFF", TiffImageFile, _accept)
|
|
|
|
Image.register_save("TIFF", _save)
|
|
|
|
|
|
|
|
Image.register_extension("TIFF", ".tif")
|
|
|
|
Image.register_extension("TIFF", ".tiff")
|
|
|
|
|
|
|
|
Image.register_mime("TIFF", "image/tiff")
|