[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:37 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f0648f6
The following commit has been merged in the master branch:
commit f0648f638258798d4dbfdc55c160a93070d8f06a
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Jul 16 11:54:09 2008 +0000
Updated Nikon lens info to v3.25 of Robert Rottmerhusen's lens database.
---
src/nikonmn.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 33fcf93..42d6f6a 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -914,7 +914,7 @@ namespace Exiv2 {
{
#ifdef EXV_HAVE_LENSDATA
//#-----------------------------------------
- //# List of AF F-Mount lenses - version 3.18
+ //# List of AF F-Mount lenses - version 3.25
//#-----------------------------------------
//#
//# created by Robert Rottmerhusen 2005 - 2008
@@ -936,7 +936,7 @@ namespace Exiv2 {
//# Nikkor lenses by their LensID
//#------------------------------------------------------------------------------------------------
//#
- struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; const char *manuf, *lensname;}
+ static const struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; const char *manuf, *lensname;}
fmountlens[] = {
{0x01,0x58,0x50,0x50,0x14,0x14,0x02,0x00, "Nikon", "AF Nikkor 50mm f/1.8"},
{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00, "Nikon", "AF Teleconverter TC-16A 1.6x"},
@@ -1112,6 +1112,7 @@ namespace Exiv2 {
//# Sigma lenses by focal length, first fixed then zoom lenses
//#------------------------------------------------------------------------------------------------
//#
+ {0xFE,0x47,0x00,0x00,0x24,0x24,0x4B,0x06, "Sigma", "4.5mm F2.8 EX DC Circular Fisheye HSM"},
{0x26,0x48,0x11,0x11,0x30,0x30,0x1C,0x02, "Sigma", "8mm F4 EX Circular Fisheye"},
{0x79,0x40,0x11,0x11,0x2C,0x2C,0x1C,0x06, "Sigma", "8mm F3.5 EX"},
{0x02,0x3F,0x24,0x24,0x2C,0x2C,0x02,0x00, "Sigma", "14mm F3.5"},
@@ -1127,6 +1128,7 @@ namespace Exiv2 {
{0x02,0x48,0x65,0x65,0x24,0x24,0x02,0x00, "Sigma", "90mm F2.8 Macro"},
//#"32 54 6A 6A 24 24 35" "02" "Sigma" "105mm F2.8 EX DG Macro";
{0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06, "Sigma", "150mm F2.8 EX DG APO Macro HSM"},
+ {0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06, "Sigma", "150mm F2.8 EX DG APO Macro HSM"},
{0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02, "Sigma", "180mm F3.5 EX DG Macro"},
{0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02, "Sigma", "APO MACRO 180mm F3.5 EX DG HSM"},
{0x48,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02, "Sigma", "APO 300mm F2.8 EX DG HSM"},
@@ -1171,11 +1173,12 @@ namespace Exiv2 {
{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,0x40,0x44,0x73,0x2B,0x36,0x02,0x00, "Sigma", "35-135mm F3.5-4.5 a"},
- {0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06, "Sigma", "APO 50-150mm F2.8 EX DC HSM"},
+ {0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06, "Sigma", "50-150mm F2.8 EX APO DC HSM"},
{0x48,0x3C,0x50,0xA0,0x30,0x40,0x4B,0x02, "Sigma", "50-500mm F4-6.3 EX APO RF HSM"},
{0x26,0x3C,0x54,0x80,0x30,0x3C,0x1C,0x06, "Sigma", "55-200mm F4-5.6 DC"},
{0x7A,0x3B,0x53,0x80,0x30,0x3C,0x4B,0x06, "Sigma", "55-200mm F4-5.6 DC HSM"},
{0x48,0x54,0x5C,0x80,0x24,0x24,0x4B,0x02, "Sigma", "70-200mm F2.8 EX APO IF HSM"},
+ {0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06, "Sigma", "70-200mm F2.8 EX APO DG MACRO HSM II"},
{0x02,0x46,0x5C,0x82,0x25,0x25,0x02,0x00, "Sigma", "70-210mm F2.8 APO"},
{0x26,0x3C,0x5C,0x82,0x30,0x3C,0x1C,0x02, "Sigma", "70-210mm F4-5.6 UC-II"},
{0x26,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02, "Sigma", "70-300mm F4-5.6 DG Macro"},
@@ -1187,8 +1190,10 @@ namespace Exiv2 {
{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02, "Sigma", "100-300mm F4 EX IF HSM"},
{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02, "Sigma", "APO 120-300mm F2.8 EX DG 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"},
{0x26,0x40,0x7B,0xA0,0x34,0x40,0x1C,0x02, "Sigma", "APO 170-500mm F5-6.3 Aspherical RF"},
{0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02, "Sigma", "APO 300-800 F5.6 EX DG HSM"},
+ {0x48,0x3C,0xB0,0xB0,0x3C,0x3C,0x4B,0x02, "Sigma", "APO 800mm f/5.6 EX HSM"},
//#
//#------------------------------------------------------------------------------------------------
//# Tamron lenses by focal length, first fixed then zoom lenses
@@ -1204,6 +1209,7 @@ namespace Exiv2 {
{0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06, "Tamron", "AF18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
{0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
{0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06, "Tamron", "AF18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
+ {0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06, "Tamron", "AF18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)"},
{0x07,0x40,0x2F,0x44,0x2C,0x34,0x03,0x02, "Tamron", "AF19-35mm F/3.5-4.5 N"},
{0x07,0x40,0x30,0x45,0x2D,0x35,0x03,0x02, "Tamron", "AF19-35mm F/3.5-4.5"},
{0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02, "Tamron", "SP AF20-40mm F/2.7-3.5"},
@@ -1238,6 +1244,7 @@ namespace Exiv2 {
{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06, "Tokina", "AT-X 165 PRO DX - AF 16-50mm F2.8"},
//#"2F 48 30 44 24 24 29" "02" "Tokina" "AT-X 235 AF PRO - AF 20-35mm f/2.8";
{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02, "Tokina", "AT-X 287 AF PRO SV 28-70mm F2.8"},
+ {0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00, "Tokina", "AT-X 28-70mm f/2.8 AF"},
{0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02, "Tokina", "AT-X 280 AF PRO 28-80mm F2.8 Aspherical"},
{0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06, "Tokina", "AT-X 535 PRO DX - AF 50-135mm f/2.8"},
{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00, "Tokina", "AT-X 828 AF 80-200mm F2.8"},
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list