diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-23 09:36:56 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-23 09:36:56 +0200 |
commit | 8004f1a7ad3cc6a3659517f3374bdf1b63416b24 (patch) | |
tree | b7b82cc6e01cd47d22f660e25508a7d8d555dc89 /src/photos/BmpSupport.vala | |
parent | 28c68a75acac7ac3ce7fb169bc6aa65e16551c53 (diff) | |
parent | 566dc060676b41e1e58a446b7dcc4159e242fee6 (diff) |
Merge tag 'upstream/0.20.0'
Upstream version 0.20.0
Diffstat (limited to 'src/photos/BmpSupport.vala')
-rw-r--r-- | src/photos/BmpSupport.vala | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/photos/BmpSupport.vala b/src/photos/BmpSupport.vala index 546bed2..dbeb64c 100644 --- a/src/photos/BmpSupport.vala +++ b/src/photos/BmpSupport.vala @@ -71,14 +71,17 @@ public class BmpSniffer : GdkSniffer { return true; } - public override DetectedPhotoInformation? sniff() throws Error { + public override DetectedPhotoInformation? sniff(out bool is_corrupted) throws Error { + // Rely on GdkSniffer to detect corruption + is_corrupted = false; + if (!is_bmp_file(file)) return null; - - DetectedPhotoInformation? detected = base.sniff(); + + DetectedPhotoInformation? detected = base.sniff(out is_corrupted); if (detected == null) return null; - + return (detected.file_format == PhotoFileFormat.BMP) ? detected : null; } } |