summaryrefslogtreecommitdiff
path: root/libmat
diff options
context:
space:
mode:
authorintrigeri2015-07-25 14:16:59 +0000
committerintrigeri2015-07-25 14:16:59 +0000
commit6a7ec826768bf7961254c101ca4e51ef41dd6df3 (patch)
treeb414ccb2ab4000f6daeb5806a130c00fcfde0af4 /libmat
parentdbcc9ea5310024fd6e58443d25666b3a290496cf (diff)
ExiftoolStripper: white-list the "File Type Extension" and "Megapixels" fields.
Those are not actual metadata stored in the file, but rather information that can be trivially derived from the actual data. This fixes the test suite on current Debian sid, most likely because its libimage-exiftool-perl (9.98-1) reports more such "metadata" fields than the one in Jessie (9.74-1). Fix-committed: #9252 Closes: Debian#789833
Diffstat (limited to '')
-rw-r--r--libmat/exiftool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmat/exiftool.py b/libmat/exiftool.py
index 3efd4f2..aa6849d 100644
--- a/libmat/exiftool.py
+++ b/libmat/exiftool.py
@@ -14,8 +14,8 @@ class ExiftoolStripper(parser.GenericParser):
14 super(ExiftoolStripper, self).__init__(filename, parser, mime, backup, is_writable, **kwargs) 14 super(ExiftoolStripper, self).__init__(filename, parser, mime, backup, is_writable, **kwargs)
15 self.allowed = set(['ExifTool Version Number', 'File Name', 'Directory', 15 self.allowed = set(['ExifTool Version Number', 'File Name', 'Directory',
16 'File Size', 'File Modification Date/Time', 'File Access Date/Time', 'File Permissions', 16 'File Size', 'File Modification Date/Time', 'File Access Date/Time', 'File Permissions',
17 'File Type', 'MIME Type', 'Image Width', 'Image Height', 17 'File Type', 'File Type Extension', 'MIME Type', 'Image Width', 'Image Height',
18 'Image Size', 'File Inode Change Date/Time']) 18 'Image Size', 'File Inode Change Date/Time', 'Megapixels'])
19 self._set_allowed() 19 self._set_allowed()
20 20
21 def _set_allowed(self): 21 def _set_allowed(self):