[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:06 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a49ad10
The following commit has been merged in the master branch:
commit a49ad104b3092431bccd8934cc274ae672369dec
Author: nkbj <nkbj1970 at hotmail.com>
Date: Wed Jan 8 04:28:04 2014 +0000
Fix issue #944: Tokina lens name fixes. Thanks goes to Robert Rottmerhusen for explaining Tokina lens names.
---
src/nikonmn.cpp | 106 ++++++++++++++++++++++++++++----------------------------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index fc90f25..e9dcf29 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1723,13 +1723,13 @@ namespace Exiv2 {
// Seven misidentified lenses due to double LensIDs:
//
// 2F 48 30 44 24 24 29 02.1: Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF
-// 2F 48 30 44 24 24 29 02.2: Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)
+// 2F 48 30 44 24 24 29 02.2: Tokina AT-X 235 AF PRO (20-35mm f/2.8)
//
// 32 54 6A 6A 24 24 35 02.1: Nikon AF Micro-Nikkor 105mm f/2.8D
// 32 54 6A 6A 24 24 35 02.2: Sigma Macro 105mm F2.8 EX DG
//
// 7A 3C 1F 37 30 30 7E 06.1: Nikon AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED
-// 7A 3C 1F 37 30 30 7E 06.2: Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)
+// 7A 3C 1F 37 30 30 7E 06.2: Tokina AT-X 124 AF PRO DX II (12-24mm f/4)
//
// 8B 40 2D 80 2C 3C FD 0E.1: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED
// 8B 40 2D 80 2C 3C FD 0E.2: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II
@@ -1737,11 +1737,11 @@ namespace Exiv2 {
// 32 53 64 64 24 24 35 02.1: Tamron SP AF 90mm F/2.8 Macro 1:1 (172E)
// 32 53 64 64 24 24 35 02.2: Tamron SP AF 90mm F/2.8 Di Macro 1:1 (272E)
//
-// 2F 40 30 44 2C 34 29 02.1: Tokina AF 235 II (AF 20-35mm f/3.5-4.5)
-// 2F 40 30 44 2C 34 29 02.2: Tokina AF 193 (AF 19-35mm f/3.5-4.5)
+// 2F 40 30 44 2C 34 29 02.1: Tokina AF 235 II (20-35mm f/3.5-4.5)
+// 2F 40 30 44 2C 34 29 02.2: Tokina AF 193 (19-35mm f/3.5-4.5)
//
-// 25 48 3C 5C 24 24 1B 02.1: Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)
-// 25 48 3C 5C 24 24 1B 02.2: Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)
+// 25 48 3C 5C 24 24 1B 02.1: Tokina AT-X 287 AF PRO SV (28-70mm f/2.8)
+// 25 48 3C 5C 24 24 1B 02.2: Tokina AT-X 270 AF PRO II (28-70mm f/2.6-2.8)
//
//
// product number/order code not complete
@@ -2216,54 +2216,54 @@ fmountlens[] = {
// Tokina Lenses by focal length, first fixed then zoom lenses
//------------------------------------------------------------------------------
//
-{0x00,0x40,0x2B,0x2B,0x2C,0x2C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 17 AF PRO (AF 17mm f/3.5)"},
-{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x40,0x00,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"},
-{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x40,0x00,0x03, "Tokina", "T310003N", "AT-X M100 PRO D (AF 100mm f/2.8 Macro)"},
-{0x27,0x48,0x8E,0x8E,0x30,0x30,0x1D,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 304 AF (AF 300mm f/4.0)"},
-{0x00,0x54,0x8E,0x8E,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 300 AF PRO (AF 300mm f/2.8)"},
-{0x12,0x3B,0x98,0x98,0x3D,0x3D,0x09,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 400 AF SD (AF 400mm f/5.6)"},
+{0x00,0x40,0x2B,0x2B,0x2C,0x2C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 17 AF PRO (17mm f/3.5)"},
+{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x40,0x00,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (35mm f/2.8 Macro)"},
+{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x40,0x00,0x03, "Tokina", "T310003N", "AT-X M100 AF PRO D (100mm f/2.8 Macro)"},
+{0x27,0x48,0x8E,0x8E,0x30,0x30,0x1D,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 304 AF (300mm f/4.0)"},
+{0x00,0x54,0x8E,0x8E,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 300 AF PRO (300mm f/2.8)"},
+{0x12,0x3B,0x98,0x98,0x3D,0x3D,0x09,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 400 AF SD (400mm f/5.6)"},
//
-{0x00,0x40,0x18,0x2B,0x2C,0x34,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4101703", "AT-X 107 DX Fisheye (AF 10-17mm f/3.5-4.5)"},
-{0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"},
-{0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
-{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
-{0x00,0x48,0x29,0x3C,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)"},
-{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (AF 16-50mm f/2.8)"},
-{0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"},
-{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AF 193 (AF 19-35mm f/3.5-4.5)"},
-{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 235 AF PRO (AF 20-35mm f/2.8)"},
-//M "Tokina" "" "AF 235 (AF 20-35mm f/3.5-4.5)"
-{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x01,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"},
-//M "Tokina" "" "AT-X 240 AF (AF 24-40mm f/2.8)"
-{0x00,0x40,0x37,0x80,0x2C,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 242 AF (AF 24-200mm f/3.5-5.6)"},
-{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"},
-{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x01,0x03, "Tokina", "", "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"},
-{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (AF 28-70mm f/2.8)"},
-{0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (AF 28-70mm f/2.8-4.5)"},
-{0x07,0x40,0x3C,0x5C,0x2C,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 270 II (AF 28-70mm f/3.5-4.5)"},
-{0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 280 AF PRO (AF 28-80mm f/2.8)"},
-//M "Tokina" "" "AF 280 II EMZ (AF 28-80mm f/3.5-5.6)"
-//M "Tokina" "" "AF 205 (AF 28-105mm f/3.5-4.5)"
-//M "Tokina" "" "AF 282 (AF 28-200mm 3.5-5.6)"
-//M "Tokina" "" "AF 282 EMZ II (AF 28-210mm f/4.2-6.5)"
-//M "Tokina" "" "AF 370 (AF 35-70mm f/3.5-4.6)"
-//M "Tokina" "" "AF 370 II (AF 35-70mm f/3.5-4.6)"
-{0x25,0x44,0x44,0x8E,0x34,0x42,0x1B,0x02,0x00,0x00,0x03, "Tokina", "", "AF 353 (AF 35-300mm f/4.5-6.7)"},
-{0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 535 PRO DX (AF 50-135mm f/2.8)"},
-//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,0x03, "Tokina", "", "AF 730 (AF 75-300mm F4.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,0x03, "Tokina", "", "AT-X 828 AF (AF 80-200mm f/2.8)"},
-{0x24,0x54,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (AF 80-200mm f/2.8)"},
-//M "Tokina" "" "AT-X 840 AF (AF 80-400mm f/4.5-5.6)"
-{0x24,0x44,0x60,0x98,0x34,0x3C,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)"},
-{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 D (AF 80-400mm f/4.5-5.6)"},
-{0x14,0x48,0x68,0x8E,0x30,0x30,0x0B,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 340 AF (AF 100-300mm f/4)"},
-//M "Tokina" "" "AT-X 340 AF-II (AF 100-300mm f/4)"
-//M "Tokina" "" "AF 130 EMZ II (AF 100-300mm f/5.6-6.7)"
-//M "Tokina" "" "AF 140 EMZ (AF 100-400mm f/4.5-6.3)"
+{0x00,0x40,0x18,0x2B,0x2C,0x34,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4101703", "AT-X 107 AF DX Fisheye (10-17mm f/3.5-4.5)"},
+{0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4111603", "AT-X 116 PRO DX (11-16mm f/2.8)"},
+{0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4122403", "AT-X 124 AF PRO DX (12-24mm f/4)"},
+{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (12-24mm f/4)"},
+{0x00,0x48,0x29,0x3C,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16-28 AF PRO FX (16-28mm f/2.8)"},
+{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (16-50mm f/2.8)"},
+{0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (16.5-135mm F3.5-5.6)"},
+{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AF 193 (19-35mm f/3.5-4.5)"},
+{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 235 AF PRO (20-35mm f/2.8)"},
+//M "Tokina" "" "AF 235 (20-35mm f/3.5-4.5)"
+{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x01,0x03, "Tokina", "", "AF 235 II (20-35mm f/3.5-4.5)"},
+//M "Tokina" "" "AT-X 240 AF (24-40mm f/2.8)"
+{0x00,0x40,0x37,0x80,0x2C,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 242 AF (24-200mm f/3.5-5.6)"},
+{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 270 AF PRO II (28-70mm f/2.6-2.8)"},
+{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x01,0x03, "Tokina", "", "AT-X 287 AF PRO SV (28-70mm f/2.8)"},
+{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (28-70mm f/2.8)"},
+{0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (28-70mm f/2.8-4.5)"},
+{0x07,0x40,0x3C,0x5C,0x2C,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 270 II (28-70mm f/3.5-4.5)"},
+{0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 280 AF PRO (28-80mm f/2.8)"},
+//M "Tokina" "" "AF 280 II EMZ (28-80mm f/3.5-5.6)"
+//M "Tokina" "" "AF 205 (28-105mm f/3.5-4.5)"
+//M "Tokina" "" "AF 282 (28-200mm 3.5-5.6)"
+//M "Tokina" "" "AF 282 EMZ II (28-210mm f/4.2-6.5)"
+//M "Tokina" "" "AF 370 (35-70mm f/3.5-4.6)"
+//M "Tokina" "" "AF 370 II (35-70mm f/3.5-4.6)"
+{0x25,0x44,0x44,0x8E,0x34,0x42,0x1B,0x02,0x00,0x00,0x03, "Tokina", "", "AF 353 (35-300mm f/4.5-6.7)"},
+{0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 535 PRO DX (50-135mm f/2.8)"},
+//M "Tokina" "" "AF 745 (70-210mm f/4.5)"
+//M "Tokina" "" "AF 210 (70-210mm f/4.0-5.6)"
+//M "Tokina" "" "AF 210 II SD (70-210mm f/4.0-5.6)"
+{0x12,0x44,0x5E,0x8E,0x34,0x3C,0x09,0x00,0x00,0x00,0x03, "Tokina", "", "AF 730 (75-300mm F4.5-5.6)"},
+//M "Tokina" "" "AF 730 II (75-300mm f/4.5-5.6)"
+{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF (80-200mm f/2.8)"},
+{0x24,0x54,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (80-200mm f/2.8)"},
+//M "Tokina" "" "AT-X 840 AF (80-400mm f/4.5-5.6)"
+{0x24,0x44,0x60,0x98,0x34,0x3C,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 AF-II (80-400mm f/4.5-5.6)"},
+{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 D (80-400mm f/4.5-5.6)"},
+{0x14,0x48,0x68,0x8E,0x30,0x30,0x0B,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 340 AF (100-300mm f/4)"},
+//M "Tokina" "" "AT-X 340 AF-II (100-300mm f/4)"
+//M "Tokina" "" "AF 130 EMZ II (100-300mm f/5.6-6.7)"
+//M "Tokina" "" "AF 140 EMZ (100-400mm f/4.5-6.3)"
//
{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x03, "Kenko", "", "Teleplus PRO 300 DG 1.4x"},
{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x00,0x00,0x03, "Kenko", "", "Teleplus PRO 300 DG 2.0x"},
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list