diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index e2db0712..36328e59 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2721,16 +2721,17 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value, {0xA1, 0x41, 0x19, 0x31, 0x2C, 0x2C, 0x4B, 0x06, 0x01, 0x00, 0x00, "Sigma", "", "10-20mm F3.5 EX DC HSM"}, {0x48, 0x3C, 0x19, 0x31, 0x30, 0x3C, 0x4B, 0x06, 0x01, 0x00, 0x00, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, {0xF9, 0x3C, 0x19, 0x31, 0x30, 0x3C, 0x4B, 0x06, 0x01, 0x00, 0x00, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, - {0xCA, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x4B, 0x46, 0x01, 0x00, 0x00, "Sigma", "205955", "12-24mm F4 DG HSM Art"}, + {0xCA, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x4B, 0x46, 0x01, 0x00, 0x00, "Sigma", "205955", "12-24mm F4 DG HSM | A"}, {0x48, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B, 0x06, 0x00, 0x00, 0x00, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"}, {0xF0, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B, 0x06, 0x00, 0x00, 0x00, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"}, {0x96, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B, 0x06, 0x00, 0x00, 0x00, "Sigma", "", "12-24mm F4.5-5.6 II DG HSM"}, + {0xC1, 0x48, 0x24, 0x37, 0x24, 0x24, 0x4B, 0x46, 0x00, 0x00, 0x00, "Sigma", "", "14-24mm F2.8 DG HSM | A"}, {0x26, 0x40, 0x27, 0x3F, 0x2C, 0x34, 0x1C, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "15-30mm F3.5-4.5 EX DG Aspherical DF"}, {0x48, 0x48, 0x2B, 0x44, 0x24, 0x30, 0x4B, 0x06, 0x00, 0x00, 0x00, "Sigma", "", - "17-35mm F2.8-4 EX DG Aspherical HSM"}, + "17-35mm F2.8-4 EX DG Aspherical HSM"}, {0x26, 0x54, 0x2B, 0x44, 0x24, 0x30, 0x1C, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "17-35mm F2.8-4 EX Aspherical"}, {0x9D, 0x48, 0x2B, 0x50, 0x24, 0x24, 0x4B, 0x0E, 0x00, 0x00, 0x00, "Sigma", "", "17-50mm F2.8 EX DC OS HSM"}, {0x8F, 0x48, 0x2B, 0x50, 0x24, 0x24, 0x4B, 0x0E, 0x00, 0x00, 0x00, "Sigma", "", "17-50mm F2.8 EX DC OS HSM"}, @@ -2741,7 +2742,7 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value, {0x7F, 0x48, 0x2B, 0x5C, 0x24, 0x34, 0x1C, 0x06, 0x00, 0x00, 0x00, "Sigma", "", "17-70mm F2.8-4.5 DC Macro Asp. IF"}, {0x8E, 0x3C, 0x2B, 0x5C, 0x24, 0x30, 0x4B, 0x0E, 0x00, 0x00, 0x00, "Sigma", "", - "17-70mm F2.8-4 DC MACRO OS HSM | C"}, + "17-70mm F2.8-4 DC Macro OS HSM | C"}, {0xA0, 0x48, 0x2A, 0x5C, 0x24, 0x30, 0x4B, 0x0E, 0x00, 0x00, 0xFE, "Sigma", "", "17-70mm F2.8-4 DC Macro OS HSM"}, {0x8B, 0x4C, 0x2D, 0x44, 0x14, 0x14, 0x4B, 0x06, 0x00, 0x00, 0x00, "Sigma", "", "18-35mm F1.8 DC HSM"}, {0x26, 0x40, 0x2D, 0x44, 0x2B, 0x34, 0x1C, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "18-35mm F3.5-4.5 Aspherical"}, @@ -2804,7 +2805,7 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value, {0x7A, 0x47, 0x50, 0x76, 0x24, 0x24, 0x4B, 0x06, 0x03, 0x00, 0x00, "Sigma", "", "50-150mm F2.8 EX APO DC HSM"}, {0xFD, 0x47, 0x50, 0x76, 0x24, 0x24, 0x4B, 0x06, 0x03, 0x00, 0x00, "Sigma", "691554", "50-150mm F2.8 EX APO DC HSM II"}, - {0x98, 0x48, 0x50, 0x76, 0x24, 0x24, 0x4B, 0x0E, 0x00, 0x00, 0x00, "Sigma", "", "50-150 f/2.8 EX DC APO OS HSM"}, + {0x98, 0x48, 0x50, 0x76, 0x24, 0x24, 0x4B, 0x0E, 0x00, 0x00, 0x00, "Sigma", "", "50-150mm F2.8 EX DC APO OS HSM"}, {0x48, 0x3C, 0x50, 0xA0, 0x30, 0x40, 0x4B, 0x02, 0x03, 0x00, 0x00, "Sigma", "736552", "APO 50-500mm F4-6.3 EX HSM"}, {0x9F, 0x37, 0x50, 0xA0, 0x34, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", @@ -2812,6 +2813,8 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value, // M "Sigma" "686550" "50-200mm F4-5.6 DC OS HSM"; {0x26, 0x3C, 0x54, 0x80, 0x30, 0x3C, 0x1C, 0x06, 0x00, 0x00, 0x00, "Sigma", "", "55-200mm F4-5.6 DC"}, {0x7A, 0x3B, 0x53, 0x80, 0x30, 0x3C, 0x4B, 0x06, 0x01, 0x00, 0x00, "Sigma", "", "55-200mm F4-5.6 DC HSM"}, + {0xBF, 0x38, 0x56, 0xA6, 0x34, 0x40, 0x4B, 0x4E, 0x00, 0x00, 0x00, "Sigma", "", + "60-600mm F4.5-6.3 DG OS HSM | S"}, {0x48, 0x54, 0x5C, 0x80, 0x24, 0x24, 0x4B, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "70-200mm F2.8 EX APO IF HSM"}, {0x7A, 0x48, 0x5C, 0x80, 0x24, 0x24, 0x4B, 0x06, 0x03, 0x00, 0x00, "Sigma", "", "70-200mm F2.8 EX APO DG Macro HSM II"}, @@ -2842,24 +2845,19 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value, "APO 120-300mm F2.8 EX DG HSM"}, {0xCF, 0x38, 0x6E, 0x98, 0x34, 0x3C, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"}, - {0xC3, 0x34, 0x68, 0x98, 0x38, 0x40, 0x4B, 0x4E, 0x03, 0x00, 0x00, "Sigma", "", "100-400mm F5-6.3 DG OS HSM C"}, + {0xC3, 0x34, 0x68, 0x98, 0x38, 0x40, 0x4B, 0x4E, 0x03, 0x00, 0x00, "Sigma", "", "100-400mm F5-6.3 DG OS HSM | C"}, {0x8D, 0x48, 0x6E, 0x8E, 0x24, 0x24, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", "120-300mm F2.8 DG OS HSM | S"}, {0x26, 0x44, 0x73, 0x98, 0x34, 0x3C, 0x1C, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"}, {0xCE, 0x34, 0x76, 0xA0, 0x38, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "737559", "APO 150-500mm F5-6.3 DG OS HSM"}, - {0x81, 0x34, 0x76, 0xA6, 0x38, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", - "150-600mm F5-6.3 DG OS HSM Sports"}, - {0x82, 0x34, 0x76, 0xA6, 0x38, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", - "150-600mm F5-6.3 DG OS HSM Contemporary"}, + {0x81, 0x34, 0x76, 0xA6, 0x38, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", "150-600mm F5-6.3 DG OS HSM | S"}, + {0x82, 0x34, 0x76, 0xA6, 0x38, 0x40, 0x4B, 0x0E, 0x03, 0x00, 0x00, "Sigma", "", "150-600mm F5-6.3 DG OS HSM | C"}, {0x26, 0x40, 0x7B, 0xA0, 0x34, 0x40, 0x1C, 0x02, 0x00, 0x00, 0x00, "Sigma", "", "APO 170-500mm F5-6.3 Aspherical RF"}, {0xA7, 0x49, 0x80, 0xA0, 0x24, 0x24, 0x4B, 0x06, 0x03, 0x00, 0x00, "Sigma", "", "APO 200-500mm F2.8 EX DG"}, {0x48, 0x3C, 0x8E, 0xB0, 0x3C, 0x3C, 0x4B, 0x02, 0x03, 0x00, 0x00, "Sigma", "595555", "APO 300-800mm F5.6 EX DG HSM"}, - {0xBF, 0x38, 0x56, 0xA6, 0x34, 0x40, 0x4B, 0x4E, 0x00, 0x00, 0x00, "Sigma", "", - "60-600mm F4.5-6.3 DG OS HSM | S"}, - {0xC1, 0x48, 0x24, 0x37, 0x24, 0x24, 0x4B, 0x46, 0x00, 0x00, 0x00, "Sigma", "", "14-24mm F2.8 DG HSM | A"}, // //------------------------------------------------------------------------------ // Tamron lenses by focal length, first fixed then zoom lenses 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 acb69630..6ed7e536 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 @@ -105,7 +105,7 @@ Exif.NikonLd3.AFAperture Byte 1 49 F4.1 Exif.NikonLd3.FocusPosition Byte 1 5 5 Exif.NikonLd3.FocusDistance Byte 1 104 3.98 m Exif.NikonLd3.FocalLength Byte 1 41 16.3 mm -Exif.NikonLd3.LensIDNumber Byte 1 202 Sigma 12-24mm F4 DG HSM Art +Exif.NikonLd3.LensIDNumber Byte 1 202 Sigma 12-24mm F4 DG HSM | A Exif.NikonLd3.LensFStops Byte 1 60 F5.0 Exif.NikonLd3.MinFocalLength Byte 1 31 12.2 mm Exif.NikonLd3.MaxFocalLength Byte 1 55 24.5 mm diff --git a/tests/bugfixes/github/test_pr_2069.py b/tests/bugfixes/github/test_pr_2069.py index fd4f9ee8..7c02538b 100644 --- a/tests/bugfixes/github/test_pr_2069.py +++ b/tests/bugfixes/github/test_pr_2069.py @@ -9,7 +9,7 @@ class NikonSigmaLens_APO_MACRO_180_F35_EX_DG_HSM(metaclass=system_tests.CaseMeta commands = ["$exiv2 -pa --grep lensid/i $filename"] stderr = [""] stdout = ["" - """Exif.NikonLd3.LensIDNumber Byte 1 Sigma 12-24mm F4 DG HSM Art + """Exif.NikonLd3.LensIDNumber Byte 1 Sigma 12-24mm F4 DG HSM | A """ ] retval = [0]