diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-03-08 12:39:32 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-03-08 12:39:32 +0100 |
| commit | c6a30cefff55cd247a47fa0a2d4f819592e1202b (patch) | |
| tree | 58b6ff52bc6827782c2973f1ce976e245ce5f34c /dedup/image.py | |
| parent | 751f19ec1107c9059ae4834e4b757741ebee6cbd (diff) | |
| parent | bb0aea9971bc79d8787d8f034022d0ca803fcab3 (diff) | |
| download | debian-dedup-c6a30cefff55cd247a47fa0a2d4f819592e1202b.tar.gz | |
Merge branch 'master' into sqlalchemy
In the mean time, the master branch evolved quite a bit and the schema
changed again (eqclass added to function table). The main reason for the
merge is to resolve the large amounts of conflicts once, so development
of the sqlalchemy branch can continue and still benefit from changes in
the master branch such as schema compatibility, adapting the indent
level in web app due to the use of contextlib.closing which resembles
sqlalchemy's "with db.begin() as conn:".
Conflicts:
autoimport.py
dedup/utils.py
readyaml.py
update_sharing.py
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.""" |