diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
| commit | 04597f25729740406775a3dff528c9774c84efd5 (patch) | |
| tree | fe905fc94afbdcfad60d5aaf88886a1f10f92a8c /dedup/image.py | |
| parent | ba9ae116e0bbb25e2df327ba48c82472ccfa2690 (diff) | |
| parent | d48c3c208ee6ba54225b3eb68ce5c9f3c894bfa4 (diff) | |
| download | debian-dedup-04597f25729740406775a3dff528c9774c84efd5.tar.gz | |
Merge branch master into multiarch
Resolve accumulated conflicts. In particular webapp.py gained a few
non-trivial ones, such as changes in InternalRedirect or usage of
contextlib.closing.
Conflicts:
schema.sql
webapp.py
Diffstat (limited to 'dedup/image.py')
| -rw-r--r-- | dedup/image.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dedup/image.py b/dedup/image.py index c1f2de0..ef17989 100644 --- a/dedup/image.py +++ b/dedup/image.py @@ -4,7 +4,7 @@ import struct import PIL.Image class ImageHash(object): - """A hash on the contents of an image datat type supported by PIL. This + """A hash on the contents of an image data type supported by PIL. This disregards mode, depth and meta information. Note that due to limitations in PIL and the image format (interlacing) the full contents are stored and decoded in hexdigest.""" |