[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:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a175d9a
The following commit has been merged in the master branch:
commit a175d9a9f2407f4aa5c8e858542e4bb8e8aba14c
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Nov 28 14:07:35 2009 +0000
Updated Nikon Lens lookup table to v4.1.361.01 of Robert Rottmerhusen's fmountlens list.
---
src/nikonmn.cpp | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index fe780f4..9a45b69 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1099,10 +1099,10 @@ namespace Exiv2 {
{
#ifdef EXV_HAVE_LENSDATA
//------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.1.357.01 2009-10-01
+// List of AF F-Mount lenses - Version 4.1.361.01 2009-11-10
//------------------------------------------------------------------------------
-#define FMLVERSION "4.1.357.01"
-#define FMLDATE "2009-10-01"
+#define FMLVERSION "4.1.361.01"
+#define FMLDATE "2009-11-10"
//------------------------------------------------------------------------------
//
//
@@ -1155,10 +1155,10 @@ fmountlens[] = {
//16
{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x0F,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x11,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
-{0x18,0x40,0x44,0x72,0x2C,0x34,0x0E,0x00,0x00,0x00, "Nikon", "JAA73601", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
+{0x18,0x40,0x44,0x72,0x2C,0x34,0x0E,0x00,0x00,0x00, "Nikon", "JAA736AA", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
//19
{0x1A,0x54,0x44,0x44,0x18,0x18,0x11,0x00,0x00,0x00, "Nikon", "JAA12201", "AF Nikkor 35mm f/2"},
-{0x1B,0x44,0x5E,0x8E,0x34,0x3C,0x10,0x00,0x00,0x00, "Nikon", "JAA73801", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"},
+{0x1B,0x44,0x5E,0x8E,0x34,0x3C,0x10,0x00,0x00,0x00, "Nikon", "JAA738AA", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"},
{0x1C,0x48,0x30,0x30,0x24,0x24,0x12,0x00,0x00,0x00, "Nikon", "JAA12301", "AF Nikkor 20mm f/2.8"},
{0x1D,0x42,0x44,0x5C,0x2A,0x34,0x12,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N"},
{0x1E,0x54,0x56,0x56,0x24,0x24,0x13,0x00,0x00,0x00, "Nikon", "JAA62201", "AF Micro-Nikkor 60mm f/2.8"},
@@ -1185,7 +1185,7 @@ fmountlens[] = {
{0x2B,0x3C,0x44,0x60,0x30,0x3C,0x1F,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
{0x2C,0x48,0x6A,0x6A,0x18,0x18,0x27,0x02,0x00,0x00, "Nikon", "JAA327DA", "AF DC-Nikkor 105mm f/2D"},
{0x2D,0x48,0x80,0x80,0x30,0x30,0x21,0x02,0x00,0x00, "Nikon", "JAA624DA", "AF Micro-Nikkor 200mm f/4D IF-ED"},
-{0x2E,0x48,0x5C,0x82,0x30,0x3C,0x28,0x02,0x00,0x00, "Nikon", "", "AF Nikkor 70-210mm f/4-5.6D"},
+{0x2E,0x48,0x5C,0x82,0x30,0x3C,0x28,0x02,0x00,0x00, "Nikon", "JAA747DA", "AF Nikkor 70-210mm f/4-5.6D"},
{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x00, "Nikon", "JAA746DA", "AF Zoom-Nikkor 20-35mm f/2.8D IF"},
{0x30,0x48,0x98,0x98,0x24,0x24,0x24,0x02,0x08,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED"},
{0x30,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"},
@@ -1203,8 +1203,8 @@ fmountlens[] = {
{0x37,0x48,0x30,0x30,0x24,0x24,0x36,0x02,0x00,0x00, "Nikon", "JAA127DA", "AF Nikkor 20mm f/2.8D"},
{0x38,0x4C,0x62,0x62,0x14,0x14,0x37,0x02,0x00,0x00, "Nikon", "JAA328DA", "AF Nikkor 85mm f/1.8D"},
//39 38
-{0x3A,0x40,0x3C,0x5C,0x2C,0x34,0x39,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
-{0x3B,0x48,0x44,0x5C,0x24,0x24,0x3A,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-70mm f/2.8D N"},
+{0x3A,0x40,0x3C,0x5C,0x2C,0x34,0x39,0x02,0x00,0x00, "Nikon", "JAA744DA", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
+{0x3B,0x48,0x44,0x5C,0x24,0x24,0x3A,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D N"},
{0x3C,0x48,0x60,0x80,0x24,0x24,0x3B,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
{0x3D,0x3C,0x44,0x60,0x30,0x3C,0x3E,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
{0x3E,0x48,0x3C,0x3C,0x24,0x24,0x3D,0x02,0x00,0x00, "Nikon", "JAA128DA", "AF Nikkor 28mm f/2.8D"},
@@ -1213,7 +1213,7 @@ fmountlens[] = {
{0x41,0x48,0x7c,0x7c,0x24,0x24,0x43,0x02,0x00,0x00, "Nikon", "JAA330DA", "AF Nikkor 180mm f/2.8D IF-ED"},
{0x42,0x54,0x44,0x44,0x18,0x18,0x44,0x02,0x00,0x00, "Nikon", "JAA129DA", "AF Nikkor 35mm f/2D"},
{0x43,0x54,0x50,0x50,0x0C,0x0C,0x46,0x02,0x00,0x00, "Nikon", "JAA011DB", "AF Nikkor 50mm f/1.4D"},
-{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
+{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02,0x00,0x00, "Nikon", "JAA753DB", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
{0x45,0x40,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00, "Nikon", "JAA752DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
{0x46,0x3C,0x44,0x60,0x30,0x3C,0x49,0x02,0x00,0x00, "Nikon", "JAA754DA", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"},
{0x47,0x42,0x37,0x50,0x2A,0x34,0x4A,0x02,0x00,0x00, "Nikon", "JAA756DA", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"},
@@ -1300,7 +1300,7 @@ fmountlens[] = {
{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x03,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
-{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x00,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II"},
+{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x00,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED (II)"},
{0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x00,0x00, "Nikon", "JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
{0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x00,0x00, "Nikon", "JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
//8E 90
@@ -1326,6 +1326,7 @@ fmountlens[] = {
{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"},
{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
+{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
//
//
{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
@@ -1402,8 +1403,9 @@ fmountlens[] = {
{0x26,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
{0xB6,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
{0xA6,0x48,0x37,0x5C,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "24-70mm F2.8 IF EX DG HSM"},
-{0x26,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
+{0x26,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "24-70mm F2.8 EX DG Macro"},
{0x67,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
+{0xE9,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
{0x26,0x40,0x37,0x5C,0x2C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "24-70mm F3.5-5.6 Aspherical HF"},
{0x26,0x54,0x37,0x73,0x24,0x34,0x1C,0x02,0x00,0x05, "Sigma", "", "24-135mm F2.8-4.5"},
{0x02,0x46,0x3C,0x5C,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8"},
@@ -1455,6 +1457,7 @@ fmountlens[] = {
//------------------------------------------------------------------------------
//
// "Tamron" "69E" "SP AF 14mm F/2.8 Aspherical (IF)"
+{0xF4,0x54,0x56,0x56,0x18,0x18,0x84,0x06,0x00,0x02, "Tamron", "G005", "SP AF 60mm F/2 Di II LD (IF) Macro 1:1"},
{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00,0x00,0x02, "Tamron", "52E", "SP AF 90mm F/2.5"},
// "Tamron" "152E" "SP AF 90mm F/2.5";
// "Tamron" "72E" "SP AF 90mm F/2.8 Macro 1:1";
@@ -1475,7 +1478,7 @@ fmountlens[] = {
{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
{0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06,0x00,0x02, "Tamron", "A18", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "},
-{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
+{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"},
{0x07,0x40,0x2F,0x44,0x2C,0x34,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
{0x07,0x40,0x30,0x45,0x2D,0x35,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
{0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"},
@@ -1486,7 +1489,7 @@ fmountlens[] = {
// "Tamron" "159D" "AF 28-70mm F/3.5-4.5";
// "Tamron" "259D" "AF 28-70mm F/3.5-4.5";
{0x33,0x54,0x3C,0x5E,0x24,0x24,0x62,0x02,0x00,0x02, "Tamron", "A09", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
-{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) MACRO"},
+{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
{0x10,0x3D,0x3C,0x60,0x2C,0x3C,0xD2,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
{0x45,0x3D,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
{0x00,0x48,0x3C,0x6A,0x24,0x24,0x00,0x02,0x00,0x02, "Tamron", "176D", "SP AF 28-105mm F/2.8 LD Aspherical IF"},
@@ -1500,12 +1503,12 @@ fmountlens[] = {
{0x12,0x3D,0x3C,0x80,0x2E,0x3C,0xDF,0x02,0x00,0x02, "Tamron", "271D", "AF 28-200mm F/3.8-5.6 AF Aspherical LD (IF)"},
{0x4D,0x41,0x3C,0x8E,0x2B,0x40,0x62,0x02,0x00,0x02, "Tamron", "A061", "AF 28-300mm F/3.5-6.3 XR Di LD Aspherical (IF)"},
{0x4D,0x41,0x3C,0x8E,0x2C,0x40,0x62,0x02,0x00,0x02, "Tamron", "185D", "AF 28-300mm F/3.5-6.3 XR LD Aspherical (IF)"},
-{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical [IF] MACRO"},
+{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical (IF) Macro"},
// "Tamron" "63D" "AF 35-90mm F/4-5.6";
// "Tamron" "65D" "SP AF 35-105mm F/2.8 Aspherical";
// "Tamron" "" "AF 35-135mm F/3.5-4.5";
{0x00,0x47,0x53,0x80,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A15", "AF 55-200mm F/4-5.6 Di II LD"},
-{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD [IF] MACRO"},
+{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
// "Tamron" "67D" "SP AF 70-210mm f/2.8 LD";
// "Tamron" "" "AF 70-210mm F/3.5-4.5";
// "Tamron" "158D" "AF 70-210mm F/4-5.6";
@@ -1514,7 +1517,7 @@ fmountlens[] = {
// "Tamron" "172D" "AF 70-300mm F/4-5.6";
// "Tamron" "472D" "AF 70-300mm F/4-5.6 LD";
{0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x02,0x00,0x02, "Tamron", "772D", "AF 70-300mm F/4-5.6 LD Macro 1:2"},
-{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A17", "AF 70-300mm F/4-5.6 Di LD MACRO 1:2"},
+{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A17", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"},
// "Tamron" "872D" "AF 75-300mm F/4-5.6 LD";
// "Tamron" "278D" "AF 80-210mm F/4.5-5.6";
// "Tamron" "62D" "AF 90-300mm F/4.5-5.6";
@@ -1546,8 +1549,8 @@ fmountlens[] = {
{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"},
// "Tokina" "" "AT-X 240 AF (AF 24-40mm f/2.8)";
// "Tokina" "" "AT-X 242 AF (AF 24-200mm f/3.5-4.5)";
-// "Tokina" "" "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)";
-{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x03, "Tokina", "", "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"},
+{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x03, "Tokina", "", "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"},
+//25 48 3C 5C 24 24 1B" "02" "00" "03" "Tokina" "" "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)";
{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (AF 28-70mm f/2.8)"},
{0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (AF 28-70mm f/2.8-4.5)"},
// "Tokina" "" "AF 270 II (AF 28-70mm f/3.5-4.5)";
@@ -1606,6 +1609,7 @@ fmountlens[] = {
//
// Lenses, that were upgraded with custom CPU
//
+{0x00,0x47,0x10,0x10,0x24,0x24,0x00,0x00,0x00,0x00, "Nikon", "JAA604AC", "Fisheye Nikkor 8mm f/2.8 AiS"},
{0x00,0x54,0x44,0x44,0x0C,0x0C,0x00,0x00,0x00,0x00, "Nikon", "JAA115AD", "Nikkor 35mm f/1.4 AiS"},
{0x00,0x48,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor H 50mm f/2"},
{0x00,0x48,0x68,0x68,0x24,0x24,0x00,0x00,0x00,0x00, "Nikon", "JAA304AA", "Series E 100mm f/2.8"},
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list