[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:59 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2048190
The following commit has been merged in the master branch:
commit 2048190a47ed4ec8cdf64ebe32eb64b832dbf8a0
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Oct 15 14:33:46 2010 +0000
Updated Canon lens lookup table. Presumably fixes #735.
---
src/canonmn.cpp | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 778e562..6666975 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -457,6 +457,7 @@ namespace Exiv2 {
{ 26, "Cosina 100mm f/3.5 Macro AF" }, // 1
{ 26, "Tamron SP AF 90mm f/2.8 Di Macro" }, // 2
{ 26, "Tamron SP AF 180mm f/3.5 Di Macro" }, // 3
+ { 26, "Carl Zeiss Planar T* 50mm f/1.4" }, // 4
{ 27, "Canon EF 35-80mm f/4-5.6" },
{ 28, "Canon EF 80-200mm f/4.5-5.6" }, // 0
{ 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 1
@@ -469,10 +470,14 @@ namespace Exiv2 {
{ 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1
{ 32, "Canon EF 24mm f/2.8" }, // 0
{ 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1
+ { 33, "Voigtlander or Zeiss Lens" }, // 0
+ { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1
+ { 33, "Zeiss Distagon 35mm T* f/2 ZE" }, // 2
{ 35, "Canon EF 35-80mm f/4-5.6" },
{ 36, "Canon EF 38-76mm f/4.5-5.6" },
{ 37, "Canon EF 35-80mm f/4-5.6" }, // 0
{ 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1
+ { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 2
{ 38, "Canon EF 80-200mm f/4.5-5.6" },
{ 39, "Canon EF 75-300mm f/4-5.6" },
{ 40, "Canon EF 28-80mm f/3.5-5.6" },
@@ -486,6 +491,9 @@ namespace Exiv2 {
{ 48, "Canon EF-S 18-55mm f/3.5-5.6 IS" },
{ 49, "Canon EF-S 55-250mm f/4-5.6 IS" },
{ 50, "Canon EF-S 18-200mm f/3.5-5.6 IS" },
+ { 51, "Canon EF-S 18-135mm f/3.5-5.6 IS" },
+ { 94, "Canon TS-E 17mm f/4L" },
+ { 95, "Canon TS-E 24.0mm f/3.5 L II" },
{ 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" },
{ 125, "Canon TS-E 24mm f/3.5L" },
{ 126, "Canon TS-E 45mm f/2.8" },
@@ -502,7 +510,13 @@ namespace Exiv2 {
{ 134, "Canon EF 600mm f/4L IS" },
{ 135, "Canon EF 200mm f/1.8L" },
{ 136, "Canon EF 300mm f/2.8L" },
- { 137, "Canon EF 85mm f/1.2L" },
+ { 137, "Canon EF 85mm f/1.2L" }, // 0
+ { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1
+ { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2
+ { 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" }, // 6
{ 138, "Canon EF 28-80mm f/2.8-4L" },
{ 139, "Canon EF 400mm f/2.8L" },
{ 140, "Canon EF 500mm f/4.5L" },
@@ -533,10 +547,13 @@ namespace Exiv2 {
{ 154, "Canon EF 20mm f/2.8 USM" },
{ 155, "Canon EF 85mm f/1.8 USM" },
{ 156, "Canon EF 28-105mm f/3.5-4.5 USM" },
- { 160, "Canon EF 20-35mm f/3.5-4.5 USM" },
+ { 160, "Canon EF 20-35mm f/3.5-4.5 USM" }, // 0
+ { 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1
{ 161, "Canon EF 28-70mm f/2.8L" }, // 0
{ 161, "Sigma 24-70mm EX f/2.8" }, // 1
- { 161, "Tamron 90mm f/2.8" }, // 2
+ { 161, "Sigma 28-70mm f/2.8 EX" }, // 2
+ { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical" }, // 3
+ { 161, "Tamron 90mm f/2.8" }, // 4
{ 162, "Canon EF 200mm f/2.8L" },
{ 163, "Canon EF 300mm f/4L" },
{ 164, "Canon EF 400mm f/5.6L" },
@@ -548,13 +565,15 @@ namespace Exiv2 {
{ 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
{ 169, "Sigma 18-50mm f/2.8 Macro" }, // 3
+ { 169, "Sigma 50mm f/1.4 EX DG HSM" }, // 4
{ 170, "Canon EF 200mm f/2.8L II" },
{ 171, "Canon EF 300mm f/4L" },
{ 172, "Canon EF 400mm f/5.6L" },
{ 173, "Canon EF 180mm Macro f/3.5L or Sigma Lens" }, // 0
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
{ 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM" }, // 2
- { 174, "Canon EF 135mm f/2L" },
+ { 174, "Canon EF 135mm f/2L" }, // 0
+ { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1
{ 175, "Canon EF 400mm f/2.8L" },
{ 176, "Canon EF 24-85mm f/3.5-4.5 USM" },
{ 177, "Canon EF 300mm f/4L IS" },
@@ -642,15 +661,18 @@ namespace Exiv2 {
{ 28, printCsLensByFocalLength },
{ 31, printCsLensByFocalLength },
{ 32, printCsLensByFocalLength },
+ { 33, printCsLensByFocalLength }, // not tested
{ 37, printCsLensByFocalLength },
{ 42, printCsLensByFocalLength },
{ 131, printCsLensByFocalLength },
+ { 137, printCsLensByFocalLength }, // not tested
{ 150, printCsLensByFocalLength },
{ 152, printCsLensByFocalLength },
{ 153, printCsLensByFocalLength },
{ 161, printCsLensByFocalLength },
{ 169, printCsLensByFocalLength },
- { 173, printCsLensByFocalLength } // works partly
+ { 173, printCsLensByFocalLength }, // works partly
+ { 174, printCsLensByFocalLength } // not tested
};
//! FlashActivity, tag 0x001c
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list