From 6129e48bde5d1f1083bcab5863c8130b28b3e626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Fri, 5 Aug 2022 16:15:01 +0200 Subject: [PATCH] Add Nikon3.WhiteBalanceBias2 --- src/nikonmn_int.cpp | 2 ++ test/data/test_reference_files/CH0_0174.exv.out | 1 + .../test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out | 1 + .../Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out | 1 + .../Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out | 1 + .../Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out | 1 + .../test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out | 1 + .../test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out | 1 + test/data/test_reference_files/_DSC8437.exv.out | 1 + test/data/test_reference_files/exiv2-bug1014.exv.out | 1 + test/data/test_reference_files/exiv2-bug1014_2.exv.out | 1 + test/data/test_reference_files/exiv2-bug1348.exv.out | 1 + test/data/test_reference_files/exiv2-issue1208.exv.out | 1 + test/data/test_reference_files/exiv2-issue1941-1.exv.out | 1 + test/data/test_reference_files/exiv2-pr1105.exv.out | 1 + test/data/test_reference_files/issue_743.exv.out | 1 + test/data/test_reference_files/test_issue_990.exv.out | 1 + 17 files changed, 18 insertions(+) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index b40e870fa3..83e48aeabe 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -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, diff --git a/test/data/test_reference_files/CH0_0174.exv.out b/test/data/test_reference_files/CH0_0174.exv.out index 07d810c4ff..41e1e37140 100644 --- a/test/data/test_reference_files/CH0_0174.exv.out +++ b/test/data/test_reference_files/CH0_0174.exv.out @@ -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 diff --git a/test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out b/test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out index a118a3f127..5c4eb462d6 100644 --- a/test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out +++ b/test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out @@ -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 diff --git a/test/data/test_reference_files/Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out b/test/data/test_reference_files/Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out index 384208e34b..b42eb8955e 100644 --- a/test/data/test_reference_files/Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out +++ b/test/data/test_reference_files/Sigma_120-300_DG_OS_HSM_Sport_lens.exv.out @@ -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 diff --git a/test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out b/test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out index 649f67b26c..e62fb8e4a8 100644 --- a/test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out +++ b/test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out @@ -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 diff --git a/test/data/test_reference_files/Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out b/test/data/test_reference_files/Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out index 0973d60d33..e810630fdb 100644 --- a/test/data/test_reference_files/Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out +++ b/test/data/test_reference_files/Tamron_SP_35mm_f1.4_Di_USD_F045.exv.out @@ -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 diff --git a/test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out b/test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out index d17eef2c36..8f9c960ac9 100644 --- a/test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out +++ b/test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out @@ -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 diff --git a/test/data/test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out b/test/data/test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out index 094bcf9720..441e205e8e 100644 --- a/test/data/test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out +++ b/test/data/test_reference_files/Tokina_atx-i_11-16mm_F2.8_CF.exv.out @@ -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 diff --git a/test/data/test_reference_files/_DSC8437.exv.out b/test/data/test_reference_files/_DSC8437.exv.out index 53ab4c4509..44515b22b8 100644 --- a/test/data/test_reference_files/_DSC8437.exv.out +++ b/test/data/test_reference_files/_DSC8437.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-bug1014.exv.out b/test/data/test_reference_files/exiv2-bug1014.exv.out index bb31b58b63..3a1722d915 100644 --- a/test/data/test_reference_files/exiv2-bug1014.exv.out +++ b/test/data/test_reference_files/exiv2-bug1014.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-bug1014_2.exv.out b/test/data/test_reference_files/exiv2-bug1014_2.exv.out index 2cf35d9be8..e2c29f5093 100644 --- a/test/data/test_reference_files/exiv2-bug1014_2.exv.out +++ b/test/data/test_reference_files/exiv2-bug1014_2.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-bug1348.exv.out b/test/data/test_reference_files/exiv2-bug1348.exv.out index 2c85f1e297..3f95acf9e3 100644 --- a/test/data/test_reference_files/exiv2-bug1348.exv.out +++ b/test/data/test_reference_files/exiv2-bug1348.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-issue1208.exv.out b/test/data/test_reference_files/exiv2-issue1208.exv.out index 943d00047f..2a1f21695c 100644 --- a/test/data/test_reference_files/exiv2-issue1208.exv.out +++ b/test/data/test_reference_files/exiv2-issue1208.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-issue1941-1.exv.out b/test/data/test_reference_files/exiv2-issue1941-1.exv.out index 335ae8f460..dee1db8190 100644 --- a/test/data/test_reference_files/exiv2-issue1941-1.exv.out +++ b/test/data/test_reference_files/exiv2-issue1941-1.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-pr1105.exv.out b/test/data/test_reference_files/exiv2-pr1105.exv.out index 0771c1d3eb..cc14d9753c 100644 --- a/test/data/test_reference_files/exiv2-pr1105.exv.out +++ b/test/data/test_reference_files/exiv2-pr1105.exv.out @@ -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 diff --git a/test/data/test_reference_files/issue_743.exv.out b/test/data/test_reference_files/issue_743.exv.out index 5c52542ec0..0467cb5f2f 100644 --- a/test/data/test_reference_files/issue_743.exv.out +++ b/test/data/test_reference_files/issue_743.exv.out @@ -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 diff --git a/test/data/test_reference_files/test_issue_990.exv.out b/test/data/test_reference_files/test_issue_990.exv.out index 8664515031..b14b11972a 100644 --- a/test/data/test_reference_files/test_issue_990.exv.out +++ b/test/data/test_reference_files/test_issue_990.exv.out @@ -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