From 0189a99e1c12b7e52b907e60724c932087feeca0 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 19 Jun 2016 17:02:07 +0200 Subject: [PATCH] Updated all lens interpreters with data from exiftool-10.20 --- rtexif/canonattribs.cc | 48 ++++++++++++++++++------- rtexif/nikonattribs.cc | 33 ++++++++++++++--- rtexif/olympusattribs.cc | 6 ++++ rtexif/pentaxattribs.cc | 9 ++++- rtexif/sonyminoltaattribs.cc | 68 ++++++++++++++++++++++++++++++------ 5 files changed, 136 insertions(+), 28 deletions(-) diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc index 981798732..edacb214e 100644 --- a/rtexif/canonattribs.cc +++ b/rtexif/canonattribs.cc @@ -593,6 +593,8 @@ public: choices.insert(p_t(44, "Canon EF 90-300mm f/4.5-5.6")); choices.insert(p_t(45, "Canon EF-S 18-55mm f/3.5-5.6 [II]")); choices.insert(p_t(46, "Canon EF 28-90mm f/4-5.6")); + choices.insert(p_t(47, "Zeiss Milvus 35mm f/2 or 50mm f/2")); + choices.insert(p_t(47, "Zeiss Milvus 50mm f/2 Makro")); choices.insert(p_t(48, "Canon EF-S 18-55mm f/3.5-5.6 IS")); choices.insert(p_t(49, "Canon EF-S 55-250mm f/4-5.6 IS")); choices.insert(p_t(50, "Canon EF-S 18-200mm f/3.5-5.6 IS")); @@ -626,9 +628,9 @@ public: choices.insert(p_t(137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM")); choices.insert(p_t(137, "Sigma 24-70mm f/2.8 IF EX DG HSM")); choices.insert(p_t(137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM")); - choices.insert(p_t(137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM")); + choices.insert(p_t(137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C")); choices.insert(p_t(137, "Sigma 17-50mm f/2.8 OS HSM")); - choices.insert(p_t(137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM")); + choices.insert(p_t(137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]")); choices.insert(p_t(137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD")); choices.insert(p_t(137, "Sigma 8-16mm f/4.5-5.6 DC HSM")); choices.insert(p_t(137, "Tamron SP 17-50mm f/2.8 XR Di II VC")); @@ -642,7 +644,8 @@ public: choices.insert(p_t(140, "Canon EF 500mm f/4.5L")); choices.insert(p_t(141, "Canon EF 500mm f/4.5L")); choices.insert(p_t(142, "Canon EF 300mm f/2.8L IS")); - choices.insert(p_t(143, "Canon EF 500mm f/4L IS")); + choices.insert(p_t(143, "Canon EF 500mm f/4L IS or Sigma Lens")); + choices.insert(p_t(143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM")); choices.insert(p_t(144, "Canon EF 35-135mm f/4-5.6 USM")); choices.insert(p_t(145, "Canon EF 100-300mm f/4.5-5.6 USM")); choices.insert(p_t(146, "Canon EF 70-210mm f/3.5-4.5 USM")); @@ -665,15 +668,18 @@ public: choices.insert(p_t(153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro")); choices.insert(p_t(153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14")); choices.insert(p_t(153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro")); - choices.insert(p_t(154, "Canon EF 20mm f/2.8 USM")); + choices.insert(p_t(154, "Canon EF 20mm f/2.8 USM or Zeiss Lens")); + choices.insert(p_t(154, "Zeiss Milvus 21mm f/2.8")); choices.insert(p_t(155, "Canon EF 85mm f/1.8 USM")); choices.insert(p_t(156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens")); choices.insert(p_t(156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD")); + choices.insert(p_t(156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF")); choices.insert(p_t(160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens")); choices.insert(p_t(160, "Tamron AF 19-35mm f/3.5-4.5")); choices.insert(p_t(160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4")); choices.insert(p_t(160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye")); choices.insert(p_t(160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8")); + choices.insert(p_t(160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8")); choices.insert(p_t(161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens")); choices.insert(p_t(161, "Sigma 24-70mm f/2.8 EX")); choices.insert(p_t(161, "Sigma 28-70mm f/2.8 EX")); @@ -688,7 +694,8 @@ public: choices.insert(p_t(165, "Canon EF 70-200mm f/2.8 L")); choices.insert(p_t(166, "Canon EF 70-200mm f/2.8 L + 1.4x")); choices.insert(p_t(167, "Canon EF 70-200mm f/2.8 L + 2x")); - choices.insert(p_t(168, "Canon EF 28mm f/1.8 USM")); + choices.insert(p_t(168, "Canon EF 28mm f/1.8 USM or Sigma Lens")); + choices.insert(p_t(168, "Sigma 50-100mm f/1.8 DC HSM | A")); choices.insert(p_t(169, "Canon EF 17-35mm f/2.8L or Sigma Lens")); choices.insert(p_t(169, "Sigma 18-200mm f/3.5-6.3 DC OS")); choices.insert(p_t(169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")); @@ -704,25 +711,32 @@ public: choices.insert(p_t(173, "Canon EF 180mm Macro f/3.5L or Sigma Lens")); choices.insert(p_t(173, "Sigma 180mm EX HSM Macro f/3.5")); choices.insert(p_t(173, "Sigma APO Macro 150mm f/2.8 EX DG HSM")); - choices.insert(p_t(174, "Canon EF 135mm f/2L or Sigma Lens")); + choices.insert(p_t(174, "Canon EF 135mm f/2L or Other Lens")); choices.insert(p_t(174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM")); choices.insert(p_t(174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM")); choices.insert(p_t(174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM")); + choices.insert(p_t(174, "Zeiss Milvus 100mm f/2 Makro")); choices.insert(p_t(175, "Canon EF 400mm f/2.8L")); choices.insert(p_t(176, "Canon EF 24-85mm f/3.5-4.5 USM")); choices.insert(p_t(177, "Canon EF 300mm f/4L IS")); choices.insert(p_t(178, "Canon EF 28-135mm f/3.5-5.6 IS")); choices.insert(p_t(179, "Canon EF 24mm f/1.4L")); - choices.insert(p_t(180, "Canon EF 35mm f/1.4L or Sigma Lens")); + choices.insert(p_t(180, "Canon EF 35mm f/1.4L or Other Lens")); choices.insert(p_t(180, "Sigma 50mm f/1.4 DG HSM | A")); choices.insert(p_t(180, "Sigma 24mm f/1.4 DG HSM | A")); - choices.insert(p_t(181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x")); - choices.insert(p_t(182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x")); + choices.insert(p_t(180, "Zeiss Milvus 50mm f/1.4")); + choices.insert(p_t(180, "Zeiss Milvus 85mm f/1.4")); + choices.insert(p_t(180, "Zeiss Otus 28mm f/1.4 ZE")); + choices.insert(p_t(181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens")); + choices.insert(p_t(181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x")); + choices.insert(p_t(182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens")); + choices.insert(p_t(182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x")); choices.insert(p_t(183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens")); choices.insert(p_t(183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro")); choices.insert(p_t(183, "Sigma 105mm f/2.8 EX DG OS HSM Macro")); choices.insert(p_t(183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro")); choices.insert(p_t(183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C")); + choices.insert(p_t(183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S")); choices.insert(p_t(184, "Canon EF 400mm f/2.8L + 2x")); choices.insert(p_t(185, "Canon EF 600mm f/4L IS")); choices.insert(p_t(186, "Canon EF 70-200mm f/4L")); @@ -751,6 +765,8 @@ public: choices.insert(p_t(213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens")); choices.insert(p_t(213, "Tamron SP 150-600mm f/5-6.3 Di VC USD")); choices.insert(p_t(213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro")); + choices.insert(p_t(213, "Tamron SP 35mm f/1.8 Di VC USD")); + choices.insert(p_t(213, "Tamron SP 45mm f/1.8 Di VC USD")); choices.insert(p_t(214, "Canon EF-S 18-55mm f/3.5-5.6 USM")); choices.insert(p_t(215, "Canon EF 55-200mm f/4.5-5.6 II USM")); choices.insert(p_t(217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD")); @@ -765,7 +781,7 @@ public: choices.insert(p_t(232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM")); choices.insert(p_t(233, "Canon EF 28-300mm f/3.5-5.6L IS")); choices.insert(p_t(234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens")); - choices.insert(p_t(234, "Tokina AT-X 12-28mm f/4 PRO DX")); + choices.insert(p_t(234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4")); choices.insert(p_t(235, "Canon EF-S 10-22mm f/3.5-4.5 USM")); choices.insert(p_t(236, "Canon EF-S 60mm f/2.8 Macro USM")); choices.insert(p_t(237, "Canon EF 24-105mm f/4L IS")); @@ -779,9 +795,11 @@ public: choices.insert(p_t(245, "Canon EF 70-200mm f/4L IS + 2.8x")); choices.insert(p_t(246, "Canon EF 16-35mm f/2.8L II")); choices.insert(p_t(247, "Canon EF 14mm f/2.8L II USM")); - choices.insert(p_t(248, "Canon EF 200mm f/2L IS")); + choices.insert(p_t(248, "Canon EF 200mm f/2L IS or Sigma Lens")); + choices.insert(p_t(248, "Sigma 24-35mm f/2 DG HSM | A")); choices.insert(p_t(249, "Canon EF 800mm f/5.6L IS")); - choices.insert(p_t(250, "Canon EF 24 f/1.4L II")); + choices.insert(p_t(250, "Canon EF 24mm f/1.4L II or Sigma Lens")); + choices.insert(p_t(250, "Sigma 20mm f/1.4 DG HSM | A")); choices.insert(p_t(251, "Canon EF 70-200mm f/2.8L IS II USM")); choices.insert(p_t(252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x")); choices.insert(p_t(253, "Canon EF 70-200mm f/2.8L IS II USM + 2x")); @@ -807,6 +825,8 @@ public: choices.insert(p_t(507, "Canon EF 16-35mm f/4L IS USM")); choices.insert(p_t(508, "Canon EF 11-24mm f/4L USM")); choices.insert(p_t(747, "Canon EF 100-400mm f/4.5-5.6L IS II USM")); + choices.insert(p_t(748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x")); + choices.insert(p_t(750, "Canon EF 35mm f/1.4L II USM")); choices.insert(p_t(4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM")); choices.insert(p_t(4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens")); choices.insert(p_t(4143, "Tamron 18-200mm f/3.5-6.3 Di III VC")); @@ -818,8 +838,12 @@ public: choices.insert(p_t(4149, "Canon EF-M 55-200mm f/4.5-6.3 IS STM")); choices.insert(p_t(4150, "Canon EF-S 10-18mm f/4.5-5.6 IS STM")); choices.insert(p_t(4152, "Canon EF 24-105mm f/3.5-5.6 IS STM")); + choices.insert(p_t(4153, "Canon EF-M 15-45mm f/3.5-6.3 IS STM")); choices.insert(p_t(4154, "Canon EF-S 24mm f/2.8 STM")); + choices.insert(p_t(4155, "Canon EF-M 28mm f/3.5 Macro IS STM ")); choices.insert(p_t(4156, "Canon EF 50mm f/1.8 STM")); + choices.insert(p_t(36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM")); + choices.insert(p_t(65535, "n/a")); } virtual std::string toString (Tag* t) diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc index facb13a36..db55725fa 100644 --- a/rtexif/nikonattribs.cc +++ b/rtexif/nikonattribs.cc @@ -329,6 +329,8 @@ public: lenses["00 00 48 48 53 53 00 01"] = "Loreo 40mm f/11-22 3D Lens in a Cap 9005"; lenses["00 36 1C 2D 34 3C 00 06"] = "Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical (IF) (A13)"; lenses["00 3C 1F 37 30 30 00 06"] = "Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)"; + lenses["00 3C 2B 44 30 30 00 06"] = "Tokina AT-X 17-35 f/4 PRO FX (AF 17-35mm f/4)"; + lenses["00 3C 5C 80 30 30 00 0E"] = "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)"; lenses["00 3E 80 A0 38 3F 00 02"] = "Tamron SP AF 200-500mm f/5-6.3 Di LD (IF) (A08)"; lenses["00 3F 2D 80 2B 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) (A14)"; lenses["00 3F 2D 80 2C 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14)"; @@ -354,10 +356,13 @@ public: lenses["00 48 29 3C 24 24 00 06"] = "Tokina AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)"; lenses["00 48 29 50 24 24 00 06"] = "Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)"; lenses["00 48 32 32 24 24 00 00"] = "Carl Zeiss Distagon T* 2.8/21 ZF.2"; + lenses["00 48 37 5C 24 24 00 06"] = "Tokina AT-X 24-70 f/2.8 PRO FX (AF 24-70mm f/2.8)"; + lenses["00 48 3C 3C 24 24 00 00"] = "Voigtlander Color Skopar 28mm f/2.8 SL II"; lenses["00 48 3C 60 24 24 00 02"] = "Tokina AT-X 280 AF PRO (AF 28-80mm f/2.8)"; lenses["00 48 3C 6A 24 24 00 02"] = "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF (176D)"; lenses["00 48 50 50 18 18 00 00"] = "Nikkor H 50mm f/2"; lenses["00 48 50 72 24 24 00 06"] = "Tokina AT-X 535 PRO DX (AF 50-135mm f/2.8)"; + lenses["00 48 5C 80 30 30 00 0E"] = "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)"; lenses["00 48 5C 8E 30 3C 00 06"] = "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17NII)"; lenses["00 48 68 68 24 24 00 00"] = "Series E 100mm f/2.8"; lenses["00 48 80 80 30 30 00 00"] = "Nikkor 200mm f/4 AiS"; @@ -367,7 +372,7 @@ public: lenses["00 53 2B 50 24 24 00 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16)"; lenses["00 54 2B 50 24 24 00 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)"; lenses["00 54 3C 3C 18 18 00 00"] = "Carl Zeiss Distagon T* 2/28 ZF.2"; - lenses["00 54 44 44 0C 0C 00 00"] = "Nikkor 35mm f/1.4 AiS"; + lenses["00 54 44 44 0C 0C 00 00"] = "Carl Zeiss Distagon T* 1.4/35 ZF.2"; lenses["00 54 44 44 18 18 00 00"] = "Carl Zeiss Distagon T* 2/35 ZF.2"; lenses["00 54 48 48 18 18 00 00"] = "Voigtlander Ultron 40mm f/2 SLII Aspherical"; lenses["00 54 50 50 0C 0C 00 00"] = "Carl Zeiss Planar T* 1.4/50 ZF.2"; @@ -378,11 +383,13 @@ public: lenses["00 54 62 62 0C 0C 00 00"] = "Carl Zeiss Planar T* 1.4/85 ZF.2"; lenses["00 54 68 68 18 18 00 00"] = "Carl Zeiss Makro-Planar T* 2/100 ZF.2"; lenses["00 54 68 68 24 24 00 02"] = "Tokina AT-X M100 AF PRO D (AF 100mm f/2.8 Macro)"; + lenses["00 54 72 72 18 18 00 00"] = "Carl Zeiss Apo Sonnar T* 2/135 ZF.2"; lenses["00 54 8E 8E 24 24 00 02"] = "Tokina AT-X 300 AF PRO (AF 300mm f/2.8)"; lenses["00 57 50 50 14 14 00 00"] = "Nikkor 50mm f/1.8 AI"; lenses["00 58 64 64 20 20 00 00"] = "Soligor C/D Macro MC 90mm f/2.5"; lenses["01 00 00 00 00 00 02 00"] = "TC-16A"; lenses["01 00 00 00 00 00 08 00"] = "TC-16A"; + lenses["01 54 62 62 0C 0C 00 00"] = "Zeiss Otus 1.4/85"; lenses["01 58 50 50 14 14 02 00"] = "AF Nikkor 50mm f/1.8"; lenses["01 58 50 50 14 14 05 00"] = "AF Nikkor 50mm f/1.8"; lenses["02 2F 98 98 3D 3D 02 00"] = "Sigma APO 400mm f/5.6"; @@ -611,12 +618,17 @@ public: lenses["4E 48 72 72 18 18 51 02"] = "AF DC-Nikkor 135mm f/2D"; lenses["4F 40 37 5C 2C 3C 53 06"] = "IX-Nikkor 24-70mm f/3.5-5.6"; lenses["50 48 56 7C 30 3C 54 06"] = "IX-Nikkor 60-180mm f/4-5.6"; + lenses["52 54 44 44 18 18 00 00"] = "Zeiss Milvus 35mm f/2"; lenses["53 48 60 80 24 24 57 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED"; lenses["53 48 60 80 24 24 60 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED"; + lenses["53 54 50 50 0C 0C 00 00"] = "Zeiss Milvus 50mm f/1.4"; lenses["54 44 5C 7C 34 3C 58 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"; lenses["54 44 5C 7C 34 3C 61 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"; + lenses["54 54 50 50 18 18 00 00"] = "Zeiss Milvus 50mm f/2 Macro"; + lenses["55 54 62 62 0C 0C 00 00"] = "Zeiss Milvus 85mm f/1.4"; lenses["56 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm f/4-5.6 APO Macro Super II"; lenses["56 48 5C 8E 30 3C 5A 02"] = "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"; + lenses["56 54 68 68 18 18 00 00"] = "Zeiss Milvus 100mm f/2 Macro"; lenses["59 48 98 98 24 24 5D 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED"; lenses["59 48 98 98 24 24 E1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"; lenses["59 48 98 98 24 24 F1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"; @@ -664,6 +676,7 @@ public: lenses["7A 47 2B 5C 24 34 4B 06"] = "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM"; lenses["7A 47 50 76 24 24 4B 06"] = "Sigma 50-150mm f/2.8 EX APO DC HSM"; lenses["7A 48 1C 29 24 24 7E 06"] = "Tokina AT-X 116 PRO DX II (AF 11-16mm f/2.8)"; + lenses["7A 48 1C 30 24 24 7E 06"] = "Tokina AT-X 11-20 f/2.8 PRO DX (AF 11-20mm f/2.8)"; lenses["7A 48 2B 5C 24 34 4B 06"] = "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM"; lenses["7A 48 2D 50 24 24 4B 06"] = "Sigma 18-50mm f/2.8 EX DC Macro"; lenses["7A 48 5C 80 24 24 4B 06"] = "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II"; @@ -676,6 +689,7 @@ public: lenses["80 48 1A 1A 24 24 85 06"] = "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"; lenses["81 34 76 A6 38 40 4B 0E"] = "Sigma 150-600mm f/5-6.3 DG OS HSM | S"; lenses["81 54 80 80 18 18 86 0E"] = "AF-S VR Nikkor 200mm f/2G IF-ED"; + lenses["82 34 76 A6 38 40 4B 0E"] = "Sigma 150-600mm f/5-6.3 DG OS HSM | C"; lenses["82 48 8E 8E 24 24 87 0E"] = "AF-S VR Nikkor 300mm f/2.8G IF-ED"; lenses["83 00 B0 B0 5A 5A 88 04"] = "FSA-L2, EDG 65, 800mm f/13 G"; lenses["88 54 50 50 0C 0C 4B 06"] = "Sigma 50mm f/1.4 DG HSM | A"; @@ -687,7 +701,7 @@ public: lenses["8B 4C 2D 44 14 14 4B 06"] = "Sigma 18-35mm f/1.8 DC HSM"; lenses["8C 40 2D 53 2C 3C 8E 06"] = "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"; lenses["8D 44 5C 8E 34 3C 8F 0E"] = "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"; - lenses["8E 3C 2B 5C 24 30 4B 0E"] = "Sigma 17-70mm f/2.8-4 DC Macro OS HSM Contemporary"; + lenses["8E 3C 2B 5C 24 30 4B 0E"] = "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"; lenses["8F 40 2D 72 2C 3C 91 06"] = "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"; lenses["8F 48 2B 50 24 24 4B 0E"] = "Sigma 17-50mm f/2.8 EX DC OS HSM"; lenses["90 3B 53 80 30 3C 92 0E"] = "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"; @@ -726,7 +740,7 @@ public: lenses["A1 40 18 37 2C 34 A3 06"] = "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"; lenses["A1 41 19 31 2C 2C 4B 06"] = "Sigma 10-20mm f/3.5 EX DC HSM"; lenses["A1 54 55 55 0C 0C BC 06"] = "AF-S Nikkor 58mm f/1.4G"; - lenses["A2 40 2D 53 2C 3C BD 0E"] = "AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II"; + lenses["A2 40 2D 53 2C 3C BD 0E"] = "AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II"; lenses["A2 48 5C 80 24 24 A4 0E"] = "AF-S Nikkor 70-200mm f/2.8G ED VR II"; lenses["A3 3C 29 44 30 30 A5 0E"] = "AF-S Nikkor 16-35mm f/4G ED VR"; lenses["A3 3C 5C 8E 30 3C 4B 0E"] = "Sigma 70-300mm f/4-5.6 DG OS"; @@ -735,9 +749,10 @@ public: lenses["A4 54 37 37 0C 0C A6 06"] = "AF-S Nikkor 24mm f/1.4G ED"; lenses["A5 40 2D 88 2C 40 4B 0E"] = "Sigma 18-250mm f/3.5-6.3 DC OS HSM"; lenses["A5 40 3C 8E 2C 3C A7 0E"] = "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR"; - lenses["A5 4C 44 44 14 14 C0 06"] = "AF-S Nikkor 35mm f/1.8G"; + lenses["A5 4C 44 44 14 14 C0 06"] = "AF-S Nikkor 35mm f/1.8G ED"; lenses["A6 48 37 5C 24 24 4B 06"] = "Sigma 24-70mm f/2.8 IF EX DG HSM"; lenses["A6 48 8E 8E 24 24 A8 0E"] = "AF-S VR Nikkor 300mm f/2.8G IF-ED II"; + lenses["A6 48 98 98 24 24 C1 0E"] = "AF-S Nikkor 400mm f/2.8E FL ED VR"; lenses["A7 3C 53 80 30 3C C2 0E"] = "AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II"; lenses["A7 49 80 A0 24 24 4B 06"] = "Sigma APO 200-500mm f/2.8 EX DG"; lenses["A7 4B 62 62 2C 2C A9 0E"] = "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"; @@ -748,9 +763,16 @@ public: lenses["A9 54 80 80 18 18 AB 0E"] = "AF-S Nikkor 200mm f/2G ED VR II"; lenses["AA 3C 37 6E 30 30 AC 0E"] = "AF-S Nikkor 24-120mm f/4G ED VR"; lenses["AA 48 37 5C 24 24 C5 4E"] = "AF-S Nikkor 24-70mm f/2.8E ED VR"; + lenses["AB 3C A0 A0 30 30 C6 4E"] = "AF-S Nikkor 500mm f/4E FL ED VR"; lenses["AC 38 53 8E 34 3C AE 0E"] = "AF-S DX VR Nikkor 55-300mm f/4.5-5.6G ED"; + lenses["AC 3C A6 A6 30 30 C7 4E"] = "AF-S Nikkor 600mm f/4E FL ED VR"; lenses["AD 3C 2D 8E 2C 3C AF 0E"] = "AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR"; + lenses["AD 48 28 60 24 30 C8 0E"] = "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR"; + lenses["AD 48 28 60 24 30 C8 4E"] = "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR"; + lenses["AE 3C 80 A0 3C 3C C9 0E"] = "AF-S Nikkor 200-500mm f/5.6E ED VR"; + lenses["AE 3C 80 A0 3C 3C C9 4E"] = "AF-S Nikkor 200-500mm f/5.6E ED VR"; lenses["AE 54 62 62 0C 0C B0 06"] = "AF-S Nikkor 85mm f/1.4G"; + lenses["AF 4C 37 37 14 14 CC 06"] = "AF-S Nikkor 24mm f/1.8G ED"; lenses["AF 54 44 44 0C 0C B1 06"] = "AF-S Nikkor 35mm f/1.4G"; lenses["B0 4C 50 50 14 14 B2 06"] = "AF-S Nikkor 50mm f/1.8G"; lenses["B1 48 48 48 24 24 B3 06"] = "AF-S DX Micro Nikkor 40mm f/2.8G"; @@ -758,9 +780,11 @@ public: lenses["B3 4C 62 62 14 14 B5 06"] = "AF-S Nikkor 85mm f/1.8G"; lenses["B4 40 37 62 2C 34 B6 0E"] = "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"; lenses["B5 4C 3C 3C 14 14 B7 06"] = "AF-S Nikkor 28mm f/1.8G"; + lenses["B6 3C B0 B0 3C 3C B8 0E"] = "AF-S VR Nikkor 800mm f/5.6E FL ED"; lenses["B6 48 37 56 24 24 1C 02"] = "Sigma 24-60mm f/2.8 EX DG"; lenses["B7 44 60 98 34 3C B9 0E"] = "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"; lenses["B8 40 2D 44 2C 34 BA 06"] = "AF-S Nikkor 18-35mm f/3.5-4.5G ED"; + lenses["CC 4C 50 68 14 14 4B 06"] = "Sigma 50-100mm f/1.8 DC HSM | A"; lenses["CD 3D 2D 70 2E 3C 4B 0E"] = "Sigma 18-125mm f/3.8-5.6 DC OS HSM"; lenses["CE 34 76 A0 38 40 4B 0E"] = "Sigma 150-500mm f/5-6.3 DG OS APO HSM"; lenses["CF 38 6E 98 34 3C 4B 0E"] = "Sigma APO 120-400mm f/4.5-5.6 DG OS HSM"; @@ -771,6 +795,7 @@ public: lenses["E3 54 50 50 24 24 35 02"] = "Sigma Macro 50mm f/2.8 EX DG"; lenses["E5 54 6A 6A 24 24 35 02"] = "Sigma Macro 105mm f/2.8 EX DG"; lenses["E6 41 3C 8E 2C 40 1C 02"] = "Sigma 28-300mm f/3.5-6.3 DG Macro"; + lenses["E8 4C 44 44 14 14 DF 0E"] = "Tamron SP 35mm f/1.8 VC"; lenses["E9 48 27 3E 24 24 DF 0E"] = "Tamron SP 15-30mm f/2.8 Di VC USD (A012)"; lenses["E9 54 37 5C 24 24 1C 02"] = "Sigma 24-70mm f/2.8 EX DG Macro"; lenses["EA 40 29 8E 2C 40 DF 0E"] = "Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD (B016)"; diff --git a/rtexif/olympusattribs.cc b/rtexif/olympusattribs.cc index 8ec17b90a..608b04cfe 100644 --- a/rtexif/olympusattribs.cc +++ b/rtexif/olympusattribs.cc @@ -120,6 +120,7 @@ public: lenses["00 23 00"] = "Olympus Zuiko Digital ED 14-42mm f/3.5-5.6"; lenses["00 23 10"] = "Olympus M.Zuiko Digital ED 7-14mm f/2.8 Pro"; lenses["00 24 00"] = "Olympus Zuiko Digital ED 40-150mm f/4.0-5.6"; + lenses["00 24 10"] = "Olympus M.Zuiko Digital ED 300mm f/4.0 IS Pro"; lenses["00 25 10"] = "Olympus M.Zuiko Digital ED 8mm f/1.8 Fisheye Pro"; lenses["00 30 00"] = "Olympus Zuiko Digital ED 50-200mm f/2.8-3.5 SWD"; lenses["00 31 00"] = "Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD"; @@ -138,6 +139,7 @@ public: lenses["01 05 00"] = "Sigma 30mm f/1.4 EX DC HSM"; lenses["01 05 10"] = "Sigma 60mm f/2.8 DN | A"; lenses["01 06 00"] = "Sigma APO 50-500mm f/4.0-6.3 EX DG HSM"; + lenses["01 06 10"] = "Sigma 30mm f/1.4 DC DN | C"; lenses["01 07 00"] = "Sigma Macro 105mm f/2.8 EX DG"; lenses["01 08 00"] = "Sigma APO Macro 150mm f/2.8 EX DG HSM"; lenses["01 09 00"] = "Sigma 18-50mm f/2.8 EX DC Macro"; @@ -176,8 +178,12 @@ public: lenses["02 20 10"] = "Lumix G Vario 12-32mm f/3.5-5.6 Asph. Mega OIS"; lenses["02 21 10"] = "Leica DG Nocticron 42.5mm f/1.2 Asph. Power OIS"; lenses["02 22 10"] = "Leica DG Summilux 15mm f/1.7 Asph."; + lenses["02 23 10"] = "Lumix G Vario 35-100mm f/4.0-5.6 Asph. Mega OIS"; lenses["02 24 10"] = "Lumix G Macro 30mm f/2.8 Asph. Mega OIS"; lenses["02 25 10"] = "Lumix G 42.5mm f/1.7 Asph. Power OIS"; + lenses["02 26 10"] = "Lumix G 25mm f/1.7 Asph."; + lenses["02 27 10"] = "Leica DG Vario-Elmar 100-400mm f/4.0-6.3 Asph. Power OIS"; + lenses["02 28 10"] = "Lumix G Vario 12-60mm f/3.5-5.6 Asph. Power OIS"; lenses["03 01 00"] = "Leica D Vario Elmarit 14-50mm f/2.8-3.5 Asph."; lenses["03 02 00"] = "Leica D Summilux 25mm f/1.4 Asph."; lenses["05 01 10"] = "Tamron 14-150mm f/3.5-5.8 Di III"; diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc index 8f183cd09..d350a1c92 100644 --- a/rtexif/pentaxattribs.cc +++ b/rtexif/pentaxattribs.cc @@ -701,6 +701,7 @@ public: choices.insert(p_t(256 * 3 + 44, "Sigma 12-24mm f/4.5-5.6 EX DG")); choices.insert(p_t(256 * 3 + 44, "Sigma 17-70mm f/2.8-4.5 DC Macro")); choices.insert(p_t(256 * 3 + 44, "Sigma 18-50mm f/3.5-5.6 DC")); + choices.insert(p_t(256 * 3 + 44, "Sigma 17-35mm f/2.8-4 EX DG")); choices.insert(p_t(256 * 3 + 44, "Tamron 35-90mm f/4 AF")); choices.insert(p_t(256 * 3 + 46, "Sigma or Samsung Lens (3 46)")); choices.insert(p_t(256 * 3 + 46, "Sigma APO 70-200mm f/2.8 EX")); @@ -873,11 +874,16 @@ public: choices.insert(p_t(256 * 8 + 27, "Sigma 18-200mm f/3.5-6.3 II DC HSM")); choices.insert(p_t(256 * 8 + 28, "Sigma 18-250mm f/3.5-6.3 DC Macro HSM")); choices.insert(p_t(256 * 8 + 29, "Sigma 35mm f/1.4 DG HSM")); - choices.insert(p_t(256 * 8 + 30, "Sigma 17-70mm f/2.8-4 DC Macro HSM Contemporary")); + choices.insert(p_t(256 * 8 + 30, "Sigma 17-70mm f/2.8-4 DC Macro HSM | C")); choices.insert(p_t(256 * 8 + 31, "Sigma 18-35mm f/1.8 DC HSM")); choices.insert(p_t(256 * 8 + 32, "Sigma 30mm f/1.4 DC HSM | A")); + choices.insert(p_t(256 * 8 + 34, "Sigma 18-300mm f/3.5-6.3 DC Macro HSM")); choices.insert(p_t(256 * 8 + 59, "HD PENTAX-D FA 150-450mm f/4.5-5.6 ED DC AW")); choices.insert(p_t(256 * 8 + 60, "HD PENTAX-D FA* 70-200mm f/2.8 ED DC AW")); + choices.insert(p_t(256 * 8 + 61, "HD PENTAX-D FA 28-105mm f/3.5-5.6 ED DC WR")); + choices.insert(p_t(256 * 8 + 62, "HD PENTAX-D FA 24-70mm f/2.8 ED SDM WR")); + choices.insert(p_t(256 * 8 + 63, "HD PENTAX-D FA 15-30mm f/2.8 ED SDM WR")); + choices.insert(p_t(256 * 8 + 197, "HD PENTAX-DA 55-300mm f/4.5-6.3 ED PLM WR RE")); choices.insert(p_t(256 * 8 + 198, "smc PENTAX-DA L 18-50mm f/4-5.6 DC WR RE")); choices.insert(p_t(256 * 8 + 199, "HD PENTAX-DA 18-50mm f/4-5.6 DC WR RE")); choices.insert(p_t(256 * 8 + 200, "HD PENTAX-DA 16-85mm f/3.5-5.6 ED DC WR")); @@ -915,6 +921,7 @@ public: choices.insert(p_t(256 * 11 + 14, "smc PENTAX-FA 645 55-110mm f/5.6")); choices.insert(p_t(256 * 11 + 16, "smc PENTAX-FA 645 33-55mm f/4.5 AL")); choices.insert(p_t(256 * 11 + 17, "smc PENTAX-FA 645 150-300mm f/5.6 ED [IF]")); + choices.insert(p_t(256 * 11 + 21, "HD PENTAX-D FA 645 35mm f/3.5 AL [IF]")); choices.insert(p_t(256 * 13 + 18, "smc PENTAX-D FA 645 55mm f/2.8 AL [IF] SDM AW")); choices.insert(p_t(256 * 13 + 19, "smc PENTAX-D FA 645 25mm f/4 AL [IF] SDM AW")); choices.insert(p_t(256 * 13 + 20, "HD PENTAX-D FA 645 90mm f/2.8 ED AW SR")); diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc index ea8fc0b49..c3f1d3355 100644 --- a/rtexif/sonyminoltaattribs.cc +++ b/rtexif/sonyminoltaattribs.cc @@ -611,7 +611,7 @@ public: choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855) or SAM II")); choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM II (SAL18552)")); choices.insert(p_t(56, "Sony DT 55-200mm f/4-5.6 SAM (SAL55200-2)")); - choices.insert(p_t(57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens")); + choices.insert(p_t(57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens or Commlite CM-EF-NEX adapter")); choices.insert(p_t(57, "Tamron SP AF 60mm f/2 Di II LD [IF] Macro 1:1")); choices.insert(p_t(57, "Tamron 18-270mm f/3.5-6.3 Di II PZD")); choices.insert(p_t(58, "Sony DT 30mm f/2.8 Macro SAM (SAL30M28)")); @@ -648,6 +648,7 @@ public: choices.insert(p_t(128, "Tamron AF 28-105mm f/4-5.6 [IF]")); choices.insert(p_t(128, "Sigma 35mm f/1.4 DG HSM")); choices.insert(p_t(128, "Sigma 18-35mm f/1.8 DC HSM")); + choices.insert(p_t(128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM")); choices.insert(p_t(129, "Tamron Lens (129)")); choices.insert(p_t(129, "Tamron 200-400mm f/5.6 LD")); choices.insert(p_t(129, "Tamron 70-300mm f/4-5.6 LD")); @@ -675,6 +676,7 @@ public: choices.insert(p_t(255, "Tamron SP AF 70-200mm f/2.8 Di LD IF Macro")); choices.insert(p_t(255, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical IF")); choices.insert(p_t(255, "Tamron AF 90-300mm f/4.5-5.6 Telemacro")); + choices.insert(p_t(1868, "Sigma MC-11 Adapter")); choices.insert(p_t(2550, "Minolta AF 50mm f/1.7")); choices.insert(p_t(2551, "Minolta AF 35-70mm f/4 or Other Lens")); choices.insert(p_t(2551, "Sigma UC AF 28-70mm f/3.5-4.5")); @@ -723,7 +725,7 @@ public: choices.insert(p_t(2563, "Sigma 400mm f/5.6 APO")); choices.insert(p_t(2564, "Minolta AF 50mm f/2.8 Macro or Sigma Lens")); choices.insert(p_t(2564, "Sigma 50mm f/2.8 EX Macro")); - choices.insert(p_t(2565, "Minolta AF 600mm f/4")); + choices.insert(p_t(2565, "Minolta AF 600mm f/4 APO")); choices.insert(p_t(2566, "Minolta AF 24mm f/2.8 or Sigma Lens")); choices.insert(p_t(2566, "Sigma 17-35mm f/2.8-4 EX Aspherical")); choices.insert(p_t(2572, "Minolta/Sony AF 500mm f/8 Reflex")); @@ -749,7 +751,7 @@ public: choices.insert(p_t(2590, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO")); choices.insert(p_t(2591, "Minolta AF 35mm f/1.4")); choices.insert(p_t(2592, "Minolta AF 85mm f/1.4 G (D)")); - choices.insert(p_t(2593, "Minolta AF 200mm f/2.8 G APO")); + choices.insert(p_t(2593, "Minolta AF 200mm f/2.8 APO")); choices.insert(p_t(2594, "Minolta AF 3x-1x f/1.7-2.8 Macro")); choices.insert(p_t(2596, "Minolta AF 28mm f/2")); choices.insert(p_t(2597, "Minolta AF 35mm f/2 [New]")); @@ -771,7 +773,7 @@ public: choices.insert(p_t(2620, "Minolta AF 28-70mm f/2.8 G")); choices.insert(p_t(2621, "Minolta AF 100-300mm f/4.5-5.6 xi")); choices.insert(p_t(2624, "Minolta AF 35-80mm f/4-5.6 Power Zoom")); - choices.insert(p_t(2628, "Minolta AF 80-200mm f/2.8 G")); + choices.insert(p_t(2628, "Minolta AF 80-200mm f/2.8 HS-APO G")); choices.insert(p_t(2629, "Minolta AF 85mm f/1.4 New")); choices.insert(p_t(2631, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO")); choices.insert(p_t(2632, "Minolta AF 24-50mm f/4 New")); @@ -795,7 +797,8 @@ public: choices.insert(p_t(4585, "Tamron SP AF 300mm f/2.8 LD IF")); choices.insert(p_t(4586, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF")); choices.insert(p_t(4587, "Tamron AF 70-210mm f/2.8 SP LD")); - choices.insert(p_t(6118, "Metabones Canon EF Adapter")); + choices.insert(p_t(4812, "Metabones Canon EF Speed Booster Ultra")); + choices.insert(p_t(6118, "Canon EF Adapter")); choices.insert(p_t(6553, "E-Mount, T-Mount, Other Lens or no lens")); choices.insert(p_t(6553, "Sony E 16mm f/2.8")); choices.insert(p_t(6553, "Sony E 18-55mm f/3.5-5.6 OSS")); @@ -824,14 +827,22 @@ public: choices.insert(p_t(6553, "Sony FE 24-240mm f/3.5-6.3 OSS")); choices.insert(p_t(6553, "Sony FE 28mm f/2")); choices.insert(p_t(6553, "Sony FE PZ 28-135mm f/4 G OSS")); + choices.insert(p_t(6553, "Sony FE 24-70mm f/2.8 GM")); + choices.insert(p_t(6553, "Sony FE 85mm f/1.4 GM")); + choices.insert(p_t(6553, "Sony FE 50mm f/1.8")); choices.insert(p_t(6553, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)")); choices.insert(p_t(6553, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)")); + choices.insert(p_t(6553, "Sony FE 70-300mm f/4.5-5.6 G OSS")); + choices.insert(p_t(6553, "Sony FE 70-200mm f/2.8 GM OSS")); choices.insert(p_t(6553, "Sigma 19mm f/2.8 [EX] DN")); choices.insert(p_t(6553, "Sigma 30mm f/2.8 [EX] DN")); choices.insert(p_t(6553, "Sigma 60mm f/2.8 DN")); + choices.insert(p_t(6553, "Sigma 30mm f/1.4 DC DN | C")); choices.insert(p_t(6553, "Tamron 18-200mm f/3.5-6.3 Di III VC")); choices.insert(p_t(6553, "Zeiss Batis 25mm f/2")); choices.insert(p_t(6553, "Zeiss Batis 85mm f/1.8")); + choices.insert(p_t(6553, "Zeiss Batis 18mm f/2.8")); + choices.insert(p_t(6553, "Zeiss Loxia 21mm f/2.8")); choices.insert(p_t(6553, "Zeiss Loxia 35mm f/2")); choices.insert(p_t(6553, "Zeiss Loxia 50mm f/2")); choices.insert(p_t(6553, "Zeiss Touit 12mm f/2.8")); @@ -844,6 +855,7 @@ public: choices.insert(p_t(6553, "Pentacon Auto 135mm f/2.8")); choices.insert(p_t(6553, "Pentacon Auto 29mm f/2.8")); choices.insert(p_t(6553, "Helios 44-2 58mm f/2.0")); + choices.insert(p_t(18688, "Sigma MC-11 Adapter")); choices.insert(p_t(25501, "Minolta AF 50mm f/1.7")); choices.insert(p_t(25511, "Minolta AF 35-70mm f/4 or Other Lens")); choices.insert(p_t(25511, "Sigma UC AF 28-70mm f/3.5-4.5")); @@ -892,7 +904,7 @@ public: choices.insert(p_t(25631, "Sigma 400mm f/5.6 APO")); choices.insert(p_t(25641, "Minolta AF 50mm f/2.8 Macro or Sigma Lens")); choices.insert(p_t(25641, "Sigma 50mm f/2.8 EX Macro")); - choices.insert(p_t(25651, "Minolta AF 600mm f/4")); + choices.insert(p_t(25651, "Minolta AF 600mm f/4 APO")); choices.insert(p_t(25661, "Minolta AF 24mm f/2.8 or Sigma Lens")); choices.insert(p_t(25661, "Sigma 17-35mm f/2.8-4 EX Aspherical")); choices.insert(p_t(25721, "Minolta/Sony AF 500mm f/8 Reflex")); @@ -918,7 +930,7 @@ public: choices.insert(p_t(25901, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO")); choices.insert(p_t(25911, "Minolta AF 35mm f/1.4")); choices.insert(p_t(25921, "Minolta AF 85mm f/1.4 G (D)")); - choices.insert(p_t(25931, "Minolta AF 200mm f/2.8 G APO")); + choices.insert(p_t(25931, "Minolta AF 200mm f/2.8 APO")); choices.insert(p_t(25941, "Minolta AF 3x-1x f/1.7-2.8 Macro")); choices.insert(p_t(25961, "Minolta AF 28mm f/2")); choices.insert(p_t(25971, "Minolta AF 35mm f/2 [New]")); @@ -940,7 +952,7 @@ public: choices.insert(p_t(26201, "Minolta AF 28-70mm f/2.8 G")); choices.insert(p_t(26211, "Minolta AF 100-300mm f/4.5-5.6 xi")); choices.insert(p_t(26241, "Minolta AF 35-80mm f/4-5.6 Power Zoom")); - choices.insert(p_t(26281, "Minolta AF 80-200mm f/2.8 G")); + choices.insert(p_t(26281, "Minolta AF 80-200mm f/2.8 HS-APO G")); choices.insert(p_t(26291, "Minolta AF 85mm f/1.4 New")); choices.insert(p_t(26311, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO")); choices.insert(p_t(26321, "Minolta AF 24-50mm f/4 New")); @@ -964,7 +976,8 @@ public: choices.insert(p_t(45851, "Tamron SP AF 300mm f/2.8 LD IF")); choices.insert(p_t(45861, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF")); choices.insert(p_t(45871, "Tamron AF 70-210mm f/2.8 SP LD")); - choices.insert(p_t(61184, "Metabones Canon EF Adapter")); + choices.insert(p_t(48128, "Metabones Canon EF Speed Booster Ultra")); + choices.insert(p_t(61184, "Canon EF Adapter")); choices.insert(p_t(65535, "E-Mount, T-Mount, Other Lens or no lens")); choices.insert(p_t(65535, "Sony E 16mm f/2.8")); choices.insert(p_t(65535, "Sony E 18-55mm f/3.5-5.6 OSS")); @@ -993,14 +1006,22 @@ public: choices.insert(p_t(65535, "Sony FE 24-240mm f/3.5-6.3 OSS")); choices.insert(p_t(65535, "Sony FE 28mm f/2")); choices.insert(p_t(65535, "Sony FE PZ 28-135mm f/4 G OSS")); + choices.insert(p_t(65535, "Sony FE 24-70mm f/2.8 GM")); + choices.insert(p_t(65535, "Sony FE 85mm f/1.4 GM")); + choices.insert(p_t(65535, "Sony FE 50mm f/1.8")); choices.insert(p_t(65535, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)")); choices.insert(p_t(65535, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)")); + choices.insert(p_t(65535, "Sony FE 70-300mm f/4.5-5.6 G OSS")); + choices.insert(p_t(65535, "Sony FE 70-200mm f/2.8 GM OSS")); choices.insert(p_t(65535, "Sigma 19mm f/2.8 [EX] DN")); choices.insert(p_t(65535, "Sigma 30mm f/2.8 [EX] DN")); choices.insert(p_t(65535, "Sigma 60mm f/2.8 DN")); + choices.insert(p_t(65535, "Sigma 30mm f/1.4 DC DN | C")); choices.insert(p_t(65535, "Tamron 18-200mm f/3.5-6.3 Di III VC")); choices.insert(p_t(65535, "Zeiss Batis 25mm f/2")); choices.insert(p_t(65535, "Zeiss Batis 85mm f/1.8")); + choices.insert(p_t(65535, "Zeiss Batis 18mm f/2.8")); + choices.insert(p_t(65535, "Zeiss Loxia 21mm f/2.8")); choices.insert(p_t(65535, "Zeiss Loxia 35mm f/2")); choices.insert(p_t(65535, "Zeiss Loxia 50mm f/2")); choices.insert(p_t(65535, "Zeiss Touit 12mm f/2.8")); @@ -1060,8 +1081,8 @@ public: choices.insert(p_t(3, "Sony LA-EA3 Adapter")); choices.insert(p_t(6, "Sony LA-EA4 Adapter")); choices.insert(p_t(44, "Metabones Canon EF Smart Adapter")); - choices.insert(p_t(78, "Metabones Canon EF Smart Adapter Mark III or IV")); - choices.insert(p_t(234, "Adapter only - no lens attached")); + choices.insert(p_t(78, "Metabones Canon EF Smart Adapter Mark III or Other Adapter")); + choices.insert(p_t(234, "Metabones Canon EF Smart Adapter Mark IV")); choices.insert(p_t(239, "Metabones Canon EF Speed Booster")); choices.insert(p_t(32784, "Sony E 16mm f/2.8")); choices.insert(p_t(32785, "Sony E 18-55mm f/3.5-5.6 OSS")); @@ -1090,10 +1111,35 @@ public: choices.insert(p_t(32815, "Sony FE 24-240mm f/3.5-6.3 OSS")); choices.insert(p_t(32816, "Sony FE 28mm f/2")); choices.insert(p_t(32817, "Sony FE PZ 28-135mm f/4 G OSS")); + choices.insert(p_t(32821, "Sony FE 24-70mm f/2.8 GM")); + choices.insert(p_t(32823, "Sony FE 85mm f/1.4 GM")); + choices.insert(p_t(32824, "Sony FE 50mm f/1.8")); choices.insert(p_t(32826, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)")); choices.insert(p_t(32827, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)")); + choices.insert(p_t(32828, "Sony FE 70-300mm f/4.5-5.6 G OSS")); + choices.insert(p_t(32830, "Sony FE 70-200mm f/2.8 GM OSS")); + choices.insert(p_t(49201, "Zeiss Touit 12mm f/2.8")); + choices.insert(p_t(49202, "Zeiss Touit 32mm f/1.8")); + choices.insert(p_t(49203, "Zeiss Touit 50mm f/2.8 Macro")); choices.insert(p_t(49216, "Zeiss Batis 25mm f/2")); choices.insert(p_t(49217, "Zeiss Batis 85mm f/1.8")); + choices.insert(p_t(49218, "Zeiss Batis 18mm f/2.8")); + choices.insert(p_t(49232, "Zeiss Loxia 50mm f/2")); + choices.insert(p_t(49233, "Zeiss Loxia 35mm f/2")); + choices.insert(p_t(49234, "Zeiss Loxia 21mm f/2.8")); + choices.insert(p_t(50480, "Sigma 30mm f/1.4 DC DN | C 016")); + choices.insert(p_t(50481, "Sigma 50mm f/1.4 DG HSM | A 014 + MC-11")); + choices.insert(p_t(50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C 014 + MC-11")); + choices.insert(p_t(50483, "Sigma 18-35mm f/1.8 DC HSM | A 013 + MC-11")); + choices.insert(p_t(50484, "Sigma 24-35mm f/2 DG HSM | A 015 + MC-11")); + choices.insert(p_t(50486, "Sigma 150-600mm f/5-6.3 DG OS HSM | C 015 + MC-11")); + choices.insert(p_t(50487, "Sigma 20mm f/1.4 DG HSM | A 015 + MC-11")); + choices.insert(p_t(50488, "Sigma 35mm f/1.4 DG HSM | A 012 + MC-11")); + choices.insert(p_t(50489, "Sigma 150-600mm f/5-6.3 DG OS HSM | S 014 + MC-11")); + choices.insert(p_t(50490, "Sigma 120-300mm f/2.8 DG OS HSM | S 013 + MC-11")); + choices.insert(p_t(50492, "Sigma 24-105mm f/4 DG OS HSM | A 013 + MC-11")); + choices.insert(p_t(50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C 013 + MC-11")); + choices.insert(p_t(50495, "Sigma 50-100mm f/1.8 DC HSM | A 016 + MC-11")); } virtual std::string toString (Tag* t)