From dd15b43f0c683d2bf38022919b41db72e2a98ea4 Mon Sep 17 00:00:00 2001 From: nkbj Date: Sat, 7 Dec 2013 02:26:33 +0000 Subject: [PATCH] Update lens lists to match ExifTool version 9.42. --- src/canonmn.cpp | 3 ++- src/minoltamn.cpp | 6 ++++-- src/nikonmn.cpp | 1 + src/pentaxmn.cpp | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index ab72b1bc..c7846a18 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -844,7 +844,8 @@ namespace Exiv2 { { 4144,"Canon EF 40mm f/2.8 STM" }, { 4145,"Canon EF-M 22mm f/2 STM" }, { 4146,"Canon EF-S 18-55mm f/3.5-5.6 IS STM" }, - { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM" } + { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM" }, + { 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM" } }; //! A lens id and a pretty-print function for special treatment of the id. diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index 2b3a438b..4c6a517d 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -1730,11 +1730,12 @@ namespace Exiv2 { { 255, "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | " "Tamron AF 18-250mm F3.5-6.3 XR Di II LD | " "Tamron AF 55-200mm F4-5.6 Di II | " - "Tamron AF 70-300mm F4-5.6 Di LD MACRO 1:2 | " + "Tamron AF 70-300mm F4-5.6 Di LD Macro 1:2 | " "Tamron SP AF 200-500mm F5.0-6.3 Di LD IF | " "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical IF | " "Tamron SP AF 70-200mm F2.8 Di LD IF Macro | " - "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF" }, + "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF | " + "Tamron AF 90-300mm F4.5-5.6 Telemacro" }, { 25500, "Minolta AF 50mm F1.7" }, { 25501, "Minolta AF 50mm F1.7" }, { 25510, "Minolta AF 35-70mm F4" }, @@ -1896,6 +1897,7 @@ namespace Exiv2 { "Tamron SP AF 90mm F2.5"}, { 45751, "1.4x Teleconverter " }, { 45851, "Tamron SP AF 300mm F2.8 LD IF" }, + { 45861, "Tamron SP AF 35-105mm F2.8 LD Aspherical IF" }, { 45871, "Tamron AF 70-210mm F2.8 SP LD" }, { 65535, "E-Mount, T-Mount, Other Lens or No Lens" } }; diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 81d3c0f2..64e0254a 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -1959,6 +1959,7 @@ fmountlens[] = { {0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"}, {0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"}, {0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"}, +{0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 58mm f/1.4 G"}, {0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"}, {0xA3,0x3C,0x29,0x44,0x30,0x30,0xA5,0x0E,0x01,0x00,0x00, "Nikon", "JAA806DA", "AF-S Nikkor 16-35mm f/4G ED VR"}, {0xA4,0x54,0x37,0x37,0x0C,0x0C,0xA6,0x06,0x01,0x00,0x00, "Nikon", "JAA131DA", "AF-S Nikkor 24mm f/1.4G ED"}, diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp index 85a0fce0..704cd218 100644 --- a/src/pentaxmn.cpp +++ b/src/pentaxmn.cpp @@ -837,6 +837,7 @@ namespace Exiv2 { { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" }, { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" }, { 0x07ca, "smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR" }, + { 0x07cb, "HD PENTAX-DA 55-300mm F4-5.8 ED WR" }, { 0x07cc, "HD PENTAX-DA 15mm F4 ED AL Limited" }, { 0x07cd, "HD PENTAX-DA 35mm F2.8 Macro Limited" }, { 0x07ce, "HD PENTAX-DA 70mm F2.4 Limited" },