Skip to content

Commit

Permalink
Add Nikon3.WhiteBalanceBias2
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmilos
kmilos committed Aug 5, 2022
1 parent 306424f commit 6129e48
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/nikonmn_int.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@ constexpr TagInfo Nikon3MakerNote::tagInfo_[] = {
unsignedShort, -1, EXV_PRINT_TAG(nikonShutterModes)},
{0x0037, "MechanicalShutterCount", N_("Mechanical Shutter Count"), N_("Mechanical shutter count"), IfdId::nikon3Id,
SectionId::makerTags, unsignedLong, -1, printValue},
{0x003f, "WhiteBalanceBias2", N_("White Balance Bias 2"), N_("White balance bias 2"), IfdId::nikon3Id,
SectionId::makerTags, signedRational, -1, printValue},
{0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), IfdId::nikon3Id,
SectionId::makerTags, asciiString, -1, printValue},
{0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), IfdId::nikon3Id, SectionId::makerTags,
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/CH0_0174.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.ShutterMode Short 1 81 Auto (Electronic Front Curtain)
Exif.Nikon3.MechanicalShutterCount Long 1 174 174
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 14 D G VR
Exif.Nikon3.Lens Rational 4 700/10 2000/10 280/100 280/100 70-200mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.ShutterMode Short 1 0 Mechanical
Exif.Nikon3.MechanicalShutterCount Long 1 68620 68620
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 70 D G
Exif.Nikon3.Lens Rational 4 120/10 240/10 40/10 40/10 12-24mm F4
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.ShutterMode Short 1 0 Mechanical
Exif.Nikon3.MechanicalShutterCount Long 1 251 251
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 14 D G VR
Exif.Nikon3.Lens Rational 4 1200/10 3000/10 28/10 28/10 120-300mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 80 317
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 2 D
Exif.Nikon3.Lens Rational 4 1800/10 1800/10 35/10 35/10 180mm F3.5
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.ShutterMode Short 1 0 Mechanical
Exif.Nikon3.MechanicalShutterCount Long 1 198779 198779
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 70 D G
Exif.Nikon3.Lens Rational 4 350/10 350/10 14/10 14/10 35mm F1.4
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 6 D G
Exif.Nikon3.Lens Rational 4 140/10 200/10 20/10 20/10 14-20mm F2
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 6 D G
Exif.Nikon3.Lens Rational 4 110/10 160/10 28/10 28/10 11-16mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/_DSC8437.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.ShutterMode Short 1 16 Electronic
Exif.Nikon3.MechanicalShutterCount Long 1 3487 3487
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 78 D G VR
Exif.Nikon3.Lens Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-bug1014.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 78 D G VR
Exif.Nikon3.Lens Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-bug1014_2.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 78 D G VR
Exif.Nikon3.Lens Rational 4 700/10 2000/10 28/10 28/10 70-200mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-bug1348.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Exif.Nikon3.SerialNumber Ascii 8 4463736 4463736
Exif.Nikon3.ColorSpace Short 1 2 Adobe RGB
Exif.Nikon3.ActiveDLighting Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 78 D G VR
Exif.Nikon3.Lens Rational 4 1500/10 6000/10 50/10 63/10 150-600mm F5-6.3
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-issue1208.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.ShutterMode Short 1 0 Mechanical
Exif.Nikon3.MechanicalShutterCount Long 1 43750 43750
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 70 D G
Exif.Nikon3.Lens Rational 4 850/10 850/10 14/10 14/10 85mm F1.4
Exif.Nikon3.FlashMode Byte 1 7 Fire, external
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-issue1941-1.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.ShutterMode Short 1 0 Mechanical
Exif.Nikon3.MechanicalShutterCount Long 1 5405 5405
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 6 D G
Exif.Nikon3.Lens Rational 4 850/10 850/10 18/10 18/10 85mm F1.8
Exif.Nikon3.FlashMode Byte 1 7 Fire, external
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/exiv2-pr1105.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 70 D G
Exif.Nikon3.Lens Rational 4 170/10 350/10 28/10 40/10 17-35mm F2.8-4
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/issue_743.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 108 1600
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 3 Normal
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 78 D G VR
Exif.Nikon3.Lens Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down
1 change: 1 addition & 0 deletions test/data/test_reference_files/test_issue_990.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Exif.NikonIi.ISOExpansion Short 1 0 Off
Exif.NikonIi.ISO2 Byte 1 60 100
Exif.NikonIi.ISOExpansion2 Short 1 0 Off
Exif.Nikon3.VignetteControl Short 1 0 Off
Exif.Nikon3.WhiteBalanceBias2 SRational 2 0/4 0/4 0/4 0/4
Exif.Nikon3.LensType Byte 1 14 D G VR
Exif.Nikon3.Lens Rational 4 700/10 2000/10 28/10 28/10 70-200mm F2.8
Exif.Nikon3.FlashMode Byte 1 0 Did not fire
Expand Down

0 comments on commit 6129e48

Please sign in to comment.