xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize some Tokina lens strings for Nikon

Browse Source
main
Miloš Komarčević 1 year ago committed by Miloš Komarčević
parent 77133728a0
commit ac6687bfeb
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
src/nikonmn_int.cpp
Unescape Escape View File

@ -3028,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", "",
@ -3043,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)"},
@ -3092,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)"},

2
test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out
Unescape Escape View File

@ -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

2
tests/bugfixes/github/test_pr_2073.py
Unescape Escape View File

@ -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]

Write Preview
Loading…
Cancel
Save