From 8494fd61f3f7da5537eefdaede1eb6bd5d32e2d2 Mon Sep 17 00:00:00 2001 From: nkbj Date: Sat, 12 Mar 2016 04:32:50 +0000 Subject: [PATCH] Agreed with Phil Harvey (author of ExifTool) upon a nomenclature for Sigma lens families. --- src/canonmn.cpp | 4 ++-- src/nikonmn.cpp | 8 ++++---- src/pentaxmn.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 0d61cec3..6b83c2e0 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -743,7 +743,7 @@ namespace Exiv2 { { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM" }, // 3 { 137, "Sigma 24-70mm f/2.8 IF EX DG HSM" }, // 4 { 137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM" }, // 5 - { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM Contemporary" }, // 6 + { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C" }, // 6 { 137, "Sigma 17-50mm f/2.8 OS HSM" }, // 7 { 137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]" }, // 8 { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 9 @@ -809,7 +809,7 @@ namespace Exiv2 { { 166, "Canon EF 70-200mm f/2.8 L + 1.4x" }, { 167, "Canon EF 70-200mm f/2.8 L + 2x" }, { 168, "Canon EF 28mm f/1.8 USM" }, // 0 - { 168, "Sigma 50-100mm f/1.8 DC HSM Art" }, // 1 + { 168, "Sigma 50-100mm f/1.8 DC HSM | A" }, // 1 { 169, "Canon EF 17-35mm f/2.8L" }, // 0 { 169, "Sigma 18-200mm f/3.5-6.3 DC OS" }, // 1 { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical" }, // 2 diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 44d47d7f..3ed94285 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -2054,7 +2054,7 @@ fmountlens[] = { {0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, {0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"}, {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"}, -{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM Art"}, +{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM | A"}, {0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"}, {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"}, {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"}, @@ -2099,7 +2099,7 @@ fmountlens[] = { {0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x00, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"}, {0x7A,0x48,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x00, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"}, {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 Contemporary"}, +{0x8E,0x3C,0x2B,0x5C,0x24,0x30,0x4B,0x0E,0x00,0x00,0x00, "Sigma", "", "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"}, @@ -2178,8 +2178,8 @@ fmountlens[] = { {0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x03,0x00,0x00, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"}, {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"}, diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp index 92dfb82b..079c1bf7 100644 --- a/src/pentaxmn.cpp +++ b/src/pentaxmn.cpp @@ -914,7 +914,7 @@ namespace Exiv2 { { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" }, { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" }, { 0x081d, "Sigma 35mm F1.4 DG HSM" }, - { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary" }, + { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM | C" }, { 0x081f, "Sigma 18-35mm F1.8 DC HSM" }, { 0x0820, "Sigma 30mm F1.4 DC HSM | A" }, { 0x0822, "Sigma 18-300mm F3.5-6.3 DC Macro HSM" },