[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:40:22 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b03733e
The following commit has been merged in the master branch:
commit b03733e66c52c84a7c2986b0a87a84ca0e6b1bdb
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Feb 20 12:17:41 2009 +0000
Updated Nikon Lens lookup table to v3.98 of Robert Rottmerhusen's fmountlens list.
---
src/nikonmn.cpp | 54 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 1564076..e9d81a3 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -882,10 +882,10 @@ namespace Exiv2 {
{
#ifdef EXV_HAVE_LENSDATA
//#-----------------------------------------
-//# List of AF F-Mount lenses - version 3.82
+//# List of AF F-Mount lenses - version 3.98
//#-----------------------------------------
//#
-//# created by Robert Rottmerhusen 2005 - 2008
+//# created by Robert Rottmerhusen 2005 - 2009
//# http://www.rottmerhusen.com (lens_id at rottmerhusen.com)
//#
//# with great help of Hiroshi Kamisaka (many new lenses)
@@ -932,6 +932,7 @@ fmountlens[] = {
{0x14,0x48,0x60,0x80,0x24,0x24,0x0B,0x00, "Nikon", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
{0x15,0x4C,0x62,0x62,0x14,0x14,0x0C,0x00, "Nikon", "AF Nikkor 85mm f/1.8"},
//#16
+{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x0F,0x00, "Nikon", "Nikkor 500mm f/4 P ED IF"},
{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x11,0x00, "Nikon", "Nikkor 500mm f/4 P ED IF"},
{0x18,0x40,0x44,0x72,0x2C,0x34,0x0E,0x00, "Nikon", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
//#19
@@ -981,7 +982,7 @@ fmountlens[] = {
{0x41,0x48,0x7c,0x7c,0x24,0x24,0x43,0x02, "Nikon", "AF Nikkor 180mm f/2.8D IF-ED"},
{0x42,0x54,0x44,0x44,0x18,0x18,0x44,0x02, "Nikon", "AF Nikkor 35mm f/2D"},
{0x43,0x54,0x50,0x50,0x0C,0x0C,0x46,0x02, "Nikon", "AF Nikkor 50mm f/1.4D"},
-{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02, "Nikon", "AF Nikkor 80-200mm f/4.5-5.6D"},
+{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02, "Nikon", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
{0x45,0x40,0x3C,0x60,0x2C,0x3C,0x48,0x02, "Nikon", "AF Zoom-Nikkor 28-80mm F/3.5-5.6D"},
{0x46,0x3C,0x44,0x60,0x30,0x3C,0x49,0x02, "Nikon", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"},
{0x47,0x42,0x37,0x50,0x2A,0x34,0x4A,0x02, "Nikon", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"},
@@ -997,9 +998,10 @@ fmountlens[] = {
{0x4D,0x40,0x3C,0x80,0x2C,0x3C,0x62,0x02, "Nikon", "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF"},
{0x4E,0x48,0x72,0x72,0x18,0x18,0x51,0x02, "Nikon", "AF DC-Nikkor 135mm f/2D"},
{0x4F,0x40,0x37,0x5C,0x2C,0x3C,0x53,0x06, "Nikon", "IX-Nikkor 24-70mm f/3.5-5.6"},
-//#50
+{0x50,0x48,0x56,0x7C,0x30,0x3C,0x54,0x06, "Nikon", "IX-Nikkor 60-180mm f/4-5.6"},
//#51
//#52
+{0x53,0x48,0x60,0x80,0x24,0x24,0x57,0x02, "Nikon", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
{0x53,0x48,0x60,0x80,0x24,0x24,0x60,0x02, "Nikon", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
{0x54,0x44,0x5C,0x7C,0x34,0x3C,0x58,0x02, "Nikon", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
//#55
@@ -1048,12 +1050,12 @@ fmountlens[] = {
{0x80,0x48,0x1A,0x1A,0x24,0x24,0x85,0x06, "Nikon", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"},
{0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E, "Nikon", "AF-S VR Nikkor 200mm f/2G IF-ED"},
{0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E, "Nikon", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
-//#83
-//#84
-//#85
+//#83
+//#84
+//#85
//#86
//#87
-//#88
+//#88
{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06, "Nikon", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E, "Nikon", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E, "Nikon", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
@@ -1080,7 +1082,7 @@ fmountlens[] = {
{0x9D,0x54,0x62,0x62,0x24,0x24,0x9F,0x02, "Nikon", "PC-E Micro Nikkor 85mm f/2.8D"},
{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06, "Nikon", "PC-E Micro Nikkor 85mm f/2.8D"},
{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E, "Nikon", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
-//#9F A1
+{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06, "Nikon", "AF-S DX Nikkor 35mm f/1.8G"},
{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06, "Nikon", "AF-S Nikkor 50mm f/1.4G"},
//#
//#------------------------------------------------------------------------------------------------
@@ -1095,6 +1097,7 @@ fmountlens[] = {
{0x48,0x48,0x24,0x24,0x24,0x24,0x4B,0x02, "Sigma", "14mm F2.8 EX Aspherical HSM"},
{0x26,0x48,0x27,0x27,0x24,0x24,0x1C,0x02, "Sigma", "15mm F2.8 EX Diagonal Fisheye"},
{0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02, "Sigma", "20mm F1.8 EX DG Aspherical RF"},
+{0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02, "Sigma", "24mm F1.8 EX DG Aspherical MACRO"},
{0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02, "Sigma", "24mm F1.8 EX DG Aspherical MACRO"},
{0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00, "Sigma", "24mm F2.8 Macro"},
{0x26,0x58,0x3C,0x3C,0x14,0x14,0x1C,0x02, "Sigma", "28mm F1.8 EX DG DF"},
@@ -1119,8 +1122,9 @@ fmountlens[] = {
//#
{0x48,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06, "Sigma", "10-20mm F4-5.6 EX DC HSM"},
{0xF9,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06, "Sigma", "10-20mm F4-5.6 EX DC HSM"},
-{0x48,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06, "Sigma", "12-24mm F4.5-5.6 EX Aspherical DG HSM"},
-{0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02, "Sigma", "15-30mm F3.5-4.5 EX Aspherical DG DF"},
+{0xF0,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06, "Sigma", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
+{0x48,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06, "Sigma", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
+{0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02, "Sigma", "15-30mm F3.5-4.5 EX DG Aspherical DF"},
{0x48,0x48,0x2B,0x44,0x24,0x30,0x4B,0x06, "Sigma", "17-35mm F2.8-4 EX DG Aspherical HSM"},
{0x26,0x54,0x2B,0x44,0x24,0x30,0x1C,0x02, "Sigma", "17-35mm F2.8-4 EX Aspherical"},
{0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06, "Sigma", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
@@ -1153,8 +1157,10 @@ fmountlens[] = {
{0x26,0x3E,0x3C,0x6A,0x2E,0x3C,0x1C,0x02, "Sigma", "28-105mm F3.8-5.6 UC-III Aspherical IF"},
{0x26,0x40,0x3C,0x80,0x2C,0x3C,0x1C,0x02, "Sigma", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
{0x26,0x40,0x3C,0x80,0x2B,0x3C,0x1C,0x02, "Sigma", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
+{0x26,0x3D,0x3C,0x80,0x2F,0x3D,0x1C,0x02, "Sigma", "28-300mm F3.8-5.6 Asphrical"},
{0x26,0x41,0x3C,0x8E,0x2C,0x40,0x1C,0x02, "Sigma", "28-300mm F3.5-6.3 DG Macro"},
{0x26,0x40,0x3C,0x8E,0x2C,0x40,0x1C,0x02, "Sigma", "28-300mm F3.5-6.3 Macro"},
+{0x02,0x3B,0x44,0x61,0x30,0x3D,0x02,0x00, "Sigma", "35-80mm F4-5.6"},
{0x02,0x40,0x44,0x73,0x2B,0x36,0x02,0x00, "Sigma", "35-135mm F3.5-4.5 a"},
{0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06, "Sigma", "50-150mm F2.8 EX APO DC HSM"},
{0xFD,0x47,0x50,0x76,0x24,0x24,0x4B,0x06, "Sigma", "50-150mm F2.8 EX APO DC HSM II"},
@@ -1173,6 +1179,7 @@ fmountlens[] = {
{0x77,0x44,0x61,0x98,0x34,0x3C,0x7B,0x0E, "Sigma", "80-400mm f4.5-5.6 EX OS"},
{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02, "Sigma", "APO 100-300mm F4 EX IF HSM"},
{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02, "Sigma", "APO 120-300mm F2.8 EX DG HSM"},
+{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02, "Sigma", "APO 120-300mm F2.8 EX DG HSM"},
{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E, "Sigma", "APO 120-400mm F4.5-5.6 DG OS HSM"},
{0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02, "Sigma", "135-400mm F4.5-5.6 APO Aspherical"},
{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E, "Sigma", "APO 150-500 mm F5-6.3 DG OS HSM"},
@@ -1184,10 +1191,13 @@ fmountlens[] = {
//# Tamron lenses by focal length, first fixed then zoom lenses
//#------------------------------------------------------------------------------------------------
//#
-//#"1E 5D 64 64 20 20 13" "00" "Tamron" "SP AF 90mm F/2.5 (52E)";
+//# SP AF 14mm F/2.8 Aspherical [IF] (69E)
+{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00, "Tamron", "SP AF 90mm F/2.5 (52E)"},
+//# SP AF 90mm F/2.5 (152E)
{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02, "Tamron", "SP AF 90mm F/2.8 Di Macro 1:1 (272E)"},
{0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06, "Tamron", "SP AF 90mm F/2.8 Di MACRO 1:1"},
-{0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02, "Tamron", "SP AF 180mm F3.5 Di Model B01"},
+{0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02, "Tamron", "SP AF 180mm F/3.5 Di Model B01"},
+//# SP AF 300mm F/2.8 LD-IF (60E)
//#
{0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06, "Tamron", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"},
{0x00,0x36,0x1C,0x2D,0x34,0x3C,0x00,0x06, "Tamron", "SP AF 11-18mm F/4.5-5.6 Di II LD Aspherical (IF)"},
@@ -1196,7 +1206,7 @@ fmountlens[] = {
{0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06, "Tamron", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical [IF] (A16NII)"},
{0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
{0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
-{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di-II LD Aspherical (IF) Macro"},
+{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
{0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06, "Tamron", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)"},
{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E, "Tamron", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
@@ -1238,6 +1248,7 @@ fmountlens[] = {
//#"7A 3C 1F 37 30 30 7E" "06" "Tokina" "AT-X 124 AF PRO DX II / 12-24mm f/4";
{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06, "Tokina", "AT-X 165 PRO DX / 16-50mm f/2.8"},
//#"2F 48 30 44 24 24 29" "02" "Tokina" "AT-X 235 AF PRO / 20-35mm f/2.8";
+//#"2F 40 30 44 2C 34 29" "02" "Tokina" "AF235 II / 20-35mm f/3.5-4.5";
//# "Tokina" "AT-X 270 AF PRO II / 28-70mm f/2.6-2.8"
{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02, "Tokina", "AT-X 287 AF PRO SV / 28-70mm f/2.8"},
{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00, "Tokina", "AT-X AF 28-70mm f/2.8"},
@@ -1255,14 +1266,15 @@ fmountlens[] = {
{0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00, "Coastal Optical Systems", "60mm 1:4 UV-VIS-IR Macro Apo"},
{0x00,0x54,0x48,0x48,0x18,0x18,0x00,0x00, "Voigtlander", "Ultron SL2 40mm F/2 SL II Aspherical"},
{0x00,0x54,0x55,0x55,0x0C,0x0C,0x00,0x00, "Voigtlander", "Nokton SL2 58mm F/1.4 SL II"},
-{0x07,0x3E,0x30,0x43,0x2D,0x35,0x03,0x00, "Soligor", "AF Zoom 19-35mm 1:3.5-4.5"},
+{0x07,0x3E,0x30,0x43,0x2D,0x35,0x03,0x00, "Soligor", "AF Zoom 19-35mm 1:3.5-4.5 MC"},
{0x03,0x43,0x5C,0x81,0x35,0x35,0x02,0x00, "Soligor", "AF C/D Zoom UMCS 70-210mm 1:4.5"},
-{0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00, "Cosina", "AF Zoom 28-80mm F/3.5-5.6 MC Macro"},
-{0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00, "Cosina", "AF Zoom 70-210mm F/4.5-5.6 MC Macro"},
-{0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00, "Cosina", "AF 100mm F/3.5 Macro"},
-{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02, "Unknown", "20-35mm F/3.5-4.5D"},
-{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00, "Unknown", "90mm F/2.5"},
-{0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02, "Unknown", "100-290mm F5.6-6.7"},
+{0x12,0x4A,0x5C,0x81,0x31,0x3D,0x09,0x00, "Soligor", "AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS"},
+{0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00, "Cosina", "AF 100mm F3.5 Macro"},
+{0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00, "Cosina", "AF Zoom 28-80mm F3.5-5.6 MC Macro"},
+{0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00, "Cosina", "AF Zoom 28-105mm F2.8-3.8 MC"},
+{0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00, "Cosina", "AF Zoom 70-210mm F4.5-5.6 MC Macro"},
+{0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02, "Cosina", "AF Zoom 70-300mm F4.5-5.6 MC Macro"},
+{0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02, "Cosina", "AF Zoom 100-300mm F5.6-6.7 MC Macro"},
//#
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, "Manual Lens", "No CPU"},
//#
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list