Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize some more lens strings for Nikon #2895

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Synchronize some more lens strings for Nikon #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
185198a
Synchronize some Sigma lens strings for Nikon
kmilos Jan 15, 2024
0595793
Synchronize some Tokina lens strings for Nikon
kmilos Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/nikonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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"},
Expand Down Expand Up @@ -2804,14 +2805,16 @@ 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", "",
"50-500mm F4.5-6.3 APO DG OS HSM"},
// 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"},
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3030,7 +3028,7 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value,
"AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"},
{0x00, 0x54, 0x68, 0x68, 0x24, 0x24, 0x00, 0x02, 0x40, 0x00, 0x00, "Tokina", "T310003N",
"AT-X M100 AF PRO D (AF 100mm f/2.8 Macro)"},
{0x27, 0x48, 0x8E, 0x8E, 0x30, 0x30, 0x1D, 0x02, 0x00, 0x00, 0x00, "Tokina", "", "AT-X 304 AF (AF 300mm f/4.0)"},
{0x27, 0x48, 0x8E, 0x8E, 0x30, 0x30, 0x1D, 0x02, 0x00, 0x00, 0x00, "Tokina", "", "AT-X 304 AF (AF 300mm f/4)"},
{0x00, 0x54, 0x8E, 0x8E, 0x24, 0x24, 0x00, 0x02, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 300 AF PRO (AF 300mm f/2.8)"},
{0x12, 0x3B, 0x98, 0x98, 0x3D, 0x3D, 0x09, 0x00, 0x00, 0x00, 0x00, "Tokina", "",
Expand All @@ -3045,19 +3043,20 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value,
{0x7A, 0x48, 0x1C, 0x30, 0x24, 0x24, 0x7E, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)"},
{0x8B, 0x48, 0x1C, 0x30, 0x24, 0x24, 0x85, 0x06, 0x00, 0x00, 0x00, "Tokina", "", "ATX-i 11-20mm F2.8 CF"},
{0x94, 0x54, 0x24, 0x30, 0x18, 0x18, 0x4a, 0x06, 0x00, 0x00, 0x00, "Tokina", "", "AT-X 14-20 F2 PRO DX"},
{0x00, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "T4122403",
"AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
{0x7A, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x7E, 0x06, 0x01, 0x02, 0x00, "Tokina", "T4122423",
"AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
{0x7A, 0x3C, 0x1F, 0x3C, 0x30, 0x30, 0x7E, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 12-28 PRO DX (AF 12-28mm F/4)"},
"AT-X 12-28 PRO DX (AF 12-28mm f/4)"},
{0x94, 0x54, 0x24, 0x30, 0x18, 0x18, 0x4a, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 14-20 F2 PRO DX (AF 14-20mm f/2)"},
{0x00, 0x48, 0x29, 0x3C, 0x24, 0x24, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)"},
{0x00, 0x48, 0x29, 0x50, 0x24, 0x24, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 165 PRO DX (AF 16-50mm f/2.8)"},
{0x00, 0x40, 0x2A, 0x72, 0x2C, 0x3C, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"},
"AT-X 16.5-135 DX (AF 16.5-135mm f/3.5-5.6)"},
{0x00, 0x3C, 0x2B, 0x44, 0x30, 0x30, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 17-35 F4 PRO FX (AF 17-35mm f/4)"},
{0x2F, 0x40, 0x30, 0x44, 0x2C, 0x34, 0x29, 0x02, 0x00, 0x02, 0x00, "Tokina", "", "AF 193 (AF 19-35mm f/3.5-4.5)"},
Expand Down Expand Up @@ -3094,13 +3093,14 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value,
{0x00, 0x48, 0x50, 0x72, 0x24, 0x24, 0x00, 0x06, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 535 PRO DX (AF 50-135mm f/2.8)"},
{0x00, 0x3C, 0x5C, 0x80, 0x30, 0x30, 0x00, 0x0E, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 70-200MM F4 FX VCM-S (AF 70-200mm f/4)"},
"AT-X 70-200 F4 FX VCM-S (AF 70-200mm f/4)"},
{0x00, 0x48, 0x5C, 0x80, 0x30, 0x30, 0x00, 0x0E, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 70-200MM F4 FX VCM-S (AF 70-200mm f/4)"},
"AT-X 70-200 F4 FX VCM-S (AF 70-200mm f/4)"},
// M "Tokina" "" "AF 745 (AF 70-210mm f/4.5)"
// M "Tokina" "" "AF 210 (AF 70-210mm f/4.0-5.6)"
// M "Tokina" "" "AF 210 II SD (AF 70-210mm f/4.0-5.6)"
{0x12, 0x44, 0x5E, 0x8E, 0x34, 0x3C, 0x09, 0x00, 0x00, 0x00, 0x00, "Tokina", "", "AF 730 (AF 75-300mm F4.5-5.6)"},
{0x12, 0x44, 0x5E, 0x8E, 0x34, 0x3C, 0x09, 0x00, 0x00, 0x00, 0x00, "Tokina", "",
"AF 730 (AF 75-300mm f/4.5-5.6)"},
// M "Tokina" "" "AF 730 II (AF 75-300mm f/4.5-5.6)"
{0x14, 0x54, 0x60, 0x80, 0x24, 0x24, 0x0B, 0x00, 0x00, 0x00, 0x00, "Tokina", "",
"AT-X 828 AF (AF 80-200mm f/2.8)"},
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/Sigma_12-24mm_F4_DG_HSM_Art.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Exif.NikonLd3.AFAperture Byte 1 24 F2.0
Exif.NikonLd3.FocusPosition Byte 1 2 2
Exif.NikonLd3.FocusDistance Byte 1 100 3.16 m
Exif.NikonLd3.FocalLength Byte 1 48 20.0 mm
Exif.NikonLd3.LensIDNumber Byte 1 148 Tokina AT-X 14-20 F2 PRO DX
Exif.NikonLd3.LensIDNumber Byte 1 148 Tokina AT-X 14-20 F2 PRO DX (AF 14-20mm f/2)
Exif.NikonLd3.LensFStops Byte 1 84 F7.0
Exif.NikonLd3.MinFocalLength Byte 1 36 14.1 mm
Exif.NikonLd3.MaxFocalLength Byte 1 48 20.0 mm
Expand Down
2 changes: 1 addition & 1 deletion tests/bugfixes/github/test_pr_2069.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion tests/bugfixes/github/test_pr_2073.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ class NikonTokinaLens_AT_X_14_20_F2_PRO_DX(metaclass=system_tests.CaseMeta):
filename = "$data_path/Tokina_AT-X_14-20_F2_PRO_DX.exv"
commands = ["$exiv2 -pa --grep lensid/i $filename"]
stderr = [""]
stdout = ["Exif.NikonLd3.LensIDNumber Byte 1 Tokina AT-X 14-20 F2 PRO DX\n"]
stdout = ["Exif.NikonLd3.LensIDNumber Byte 1 Tokina AT-X 14-20 F2 PRO DX (AF 14-20mm f/2)\n"]
retval = [0]
Loading