Skip to content

Commit eb78a2f

Browse files
postscript-devpostscript-dev
committed
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
1 parent 5dca23b commit eb78a2f

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎test/data/exiv2-test.out‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -971,9 +971,9 @@ File 4/16: 20040329_224245.jpg
971971
20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a
972972
20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired
973973
20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0
974-
20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0)
975-
20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0)
976-
20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0)
974+
20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a
975+
20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a
976+
20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a
977977
20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None
978978
20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off
979979
20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off
@@ -2612,9 +2612,9 @@ Compare image data and extracted data ------------------------------------
26122612
< 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a
26132613
< 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired
26142614
< 20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0
2615-
< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0)
2616-
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0)
2617-
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0)
2615+
< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a
2616+
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a
2617+
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a
26182618
< 20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None
26192619
< 20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off
26202620
< 20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off
@@ -4175,9 +4175,9 @@ Compare image data and extracted data ------------------------------------
41754175
> 20040329_224245.exv Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a
41764176
> 20040329_224245.exv Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired
41774177
> 20040329_224245.exv Exif.NikonFl1.0x0009 Byte 2 0 0
4178-
> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 (0)
4179-
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 (0)
4180-
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 (0)
4178+
> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 n/a
4179+
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a
4180+
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a
41814181
> 20040329_224245.exv Exif.NikonFl1.FlashGNDistance Byte 1 None
41824182
> 20040329_224245.exv Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off
41834183
> 20040329_224245.exv Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off
@@ -5976,9 +5976,9 @@ Compare original and inserted image data ---------------------------------
59765976
< 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a
59775977
< 20040329_224245.jpg Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired
59785978
< 20040329_224245.jpg Exif.NikonFl1.0x0009 Byte 2 0 0
5979-
< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 (0)
5980-
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 (0)
5981-
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 (0)
5979+
< 20040329_224245.jpg Exif.NikonFl1.FlashFocalLength Byte 1 n/a
5980+
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a
5981+
< 20040329_224245.jpg Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a
59825982
< 20040329_224245.jpg Exif.NikonFl1.FlashGNDistance Byte 1 None
59835983
< 20040329_224245.jpg Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off
59845984
< 20040329_224245.jpg Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off
@@ -7539,9 +7539,9 @@ Compare original and inserted image data ---------------------------------
75397539
> 20040329_224245.exv Exif.NikonFl1.ExternalFlashFirmware Short 1 n/a
75407540
> 20040329_224245.exv Exif.NikonFl1.ExternalFlashFlags Byte 1 Fired
75417541
> 20040329_224245.exv Exif.NikonFl1.0x0009 Byte 2 0 0
7542-
> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 (0)
7543-
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 (0)
7544-
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 (0)
7542+
> 20040329_224245.exv Exif.NikonFl1.FlashFocalLength Byte 1 n/a
7543+
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashRate Byte 1 n/a
7544+
> 20040329_224245.exv Exif.NikonFl1.RepeatingFlashCount Byte 1 n/a
75457545
> 20040329_224245.exv Exif.NikonFl1.FlashGNDistance Byte 1 None
75467546
> 20040329_224245.exv Exif.NikonFl1.FlashGroupAControlMode Byte 1 Off
75477547
> 20040329_224245.exv Exif.NikonFl1.FlashGroupBControlMode Byte 1 Off

0 commit comments

Comments
 (0)