From d443a3c2509889533ca812c163056bace396b586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 14 Jun 2023 20:35:58 +0200 Subject: New upstream version 0.32.1 --- src/photos/TiffSupport.vala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/photos/TiffSupport.vala') diff --git a/src/photos/TiffSupport.vala b/src/photos/TiffSupport.vala index 7ed8b98..cadcd0e 100644 --- a/src/photos/TiffSupport.vala +++ b/src/photos/TiffSupport.vala @@ -151,6 +151,9 @@ private class TiffMetadataWriter : PhotoFileMetadataWriter { } } +private const uint16 FILE_MARKER_TIFF = 42; +private const uint16 FILE_MARKER_BIGTIFF = 43; + public bool is_tiff(File file, Cancellable? cancellable = null) throws Error { DataInputStream dins = new DataInputStream(file.read()); @@ -173,8 +176,9 @@ public bool is_tiff(File file, Cancellable? cancellable = null) throws Error { // second two bytes: some random number uint16 lue = dins.read_uint16(cancellable); - if (lue != 42) + if (lue != FILE_MARKER_TIFF && lue != FILE_MARKER_BIGTIFF) { return false; + } // remaining bytes are offset of first IFD, which doesn't matter for our purposes return true; -- cgit v1.2.3