From eb78a2feae41f2c4cd91015a2f651d61d05a16f3 Mon Sep 17 00:00:00 2001 From: postscript-dev Date: Thu, 14 Oct 2021 18:03:26 +0100 Subject: [PATCH] Add NikonFl7 makernotes group source code This differs from other `NikonFl` groups as it uses `bigEndian` format. This is because `Exif.NikonFl7.ExternalFlashFirmware` is a short and was incorrectly output when using `invalidByteOrder` or `littleEndian`. The other groups use `invalidByteOrder` which may be wrong. Sadly all of Exiv2s --- test/data/exiv2-test.out | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 87513594..f7d02dfa 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -971,9 +971,9 @@ File 4/16: 20040329_224245.jpg 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired 20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0 -20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0) -20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0) -20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0) +20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a +20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a +20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a 20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None 20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off 20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off @@ -2612,9 +2612,9 @@ Compare image data and extracted data ------------------------------------ < 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a < 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired < 20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0 -< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0) -< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0) -< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0) +< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a +< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a +< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a < 20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None < 20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off < 20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off @@ -4175,9 +4175,9 @@ Compare image data and extracted data ------------------------------------ > 20040329_224245.exv Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a > 20040329_224245.exv Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired > 20040329_224245.exv Exif.NikonFl1.0x0009 Byte 2 0 0 -> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 (0) -> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 (0) -> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 (0) +> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 n/a +> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a +> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a > 20040329_224245.exv Exif.NikonFl1.FlashGNDistance Byte 1 None > 20040329_224245.exv Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off > 20040329_224245.exv Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off @@ -5976,9 +5976,9 @@ Compare original and inserted image data --------------------------------- < 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a < 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired < 20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0 -< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0) -< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0) -< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0) +< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a +< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a +< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a < 20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None < 20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off < 20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off @@ -7539,9 +7539,9 @@ Compare original and inserted image data --------------------------------- > 20040329_224245.exv Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a > 20040329_224245.exv Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired > 20040329_224245.exv Exif.NikonFl1.0x0009 Byte 2 0 0 -> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 (0) -> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 (0) -> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 (0) +> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 n/a +> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a +> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a > 20040329_224245.exv Exif.NikonFl1.FlashGNDistance Byte 1 None > 20040329_224245.exv Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off > 20040329_224245.exv Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off