From 9a4b34ab703447825458153ffbca6d0f237abbc0 Mon Sep 17 00:00:00 2001 From: Mark Ord Date: Wed, 6 Sep 2023 09:31:54 -0700 Subject: [PATCH] Nikon D750 produces files with the maker note header as Nikon\x00\x02\x11\x00\x00. Add that to Nikon Type 3 detection, otherwise code falls into else (No header - Nikon Type 2) and fails. --- Makernotes/nikon.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makernotes/nikon.php b/Makernotes/nikon.php index bf38d95..3240a05 100644 --- a/Makernotes/nikon.php +++ b/Makernotes/nikon.php @@ -32,6 +32,8 @@ * Header 10 Bytes "Nikon\x00\x02\x10\x00\x00" * or * "Nikon\x00\x02\x00\x00\x00" +* or +* "Nikon\x00\x02\x11\x00\x00" * TIFF Data Variable TIFF header, with associated * Standard IFD Data using, Nikon * Type 3 Tags. Offsets are from @@ -131,7 +133,8 @@ function get_Nikon_Makernote( $Makernote_Tag, $EXIF_Array, $filehnd, $Make_Field } else if ( ( substr( $Makernote_Tag['Data'],0 , 10 ) == "Nikon\x00\x02\x10\x00\x00" ) || - ( substr( $Makernote_Tag['Data'],0 , 10 ) == "Nikon\x00\x02\x00\x00\x00" ) ) + ( substr( $Makernote_Tag['Data'],0 , 10 ) == "Nikon\x00\x02\x00\x00\x00" ) || + ( substr( $Makernote_Tag['Data'],0 , 10 ) == "Nikon\x00\x02\x11\x00\x00" ) ) { // Nikon Type 3 Makernote