[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:20 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=19d007a
The following commit has been merged in the master branch:
commit 19d007a9328b2490743f8718f08299a441496bba
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Jun 17 03:08:42 2011 +0000
#772: Applied patch to recognize Tamron lens in Canon makernote (Milan Knizek)
---
src/canonmn.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 714196d..b7b7204 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -548,7 +548,8 @@ namespace Exiv2 {
{ 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro" }, // 4
{ 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" },
+ { 156, "Canon EF 28-105mm f/3.5-4.5 USM" }, // 0
+ { 156, "Tamron SP AF 70-300mm F4-5.6 Di VC USD" }, // 1
{ 160, "Canon EF 20-35mm f/3.5-4.5 USM" }, // 0
{ 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1
{ 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5" }, // 2
@@ -672,6 +673,7 @@ namespace Exiv2 {
{ 150, printCsLensByFocalLength },
{ 152, printCsLensByFocalLength },
{ 153, printCsLensByFocalLength },
+ { 156, printCsLensByFocalLength },
{ 160, printCsLensByFocalLength },
{ 161, printCsLensByFocalLength },
{ 169, printCsLensByFocalLength },
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list