[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=466802b

The following commit has been merged in the master branch:
commit 466802b877697d81d38ad4ff5a09a47c0c36186f
Author: tbeu <mail at tbeu.de>
Date:   Mon Aug 15 18:50:12 2016 +0000

    Update Sony/Minolta teleconverter model to match ExifTool
---
 src/minoltamn.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 5358e07..0830d68 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -2416,11 +2416,15 @@ namespace Exiv2 {
 
     //! Lookup table to translate Sony/Minolta teleconverter model values to readable labels
     extern const TagDetails minoltaSonyTeleconverterModel[] = {
-        { 0x00, N_("None")                     },
-        { 0x48, N_("Minolta AF 2x APO (D)")    },
-        { 0x50, N_("Minolta AF 2x APO II")     },
-        { 0x88, N_("Minolta AF 1.4x APO (D)")  },
-        { 0x90, N_("Minolta AF 1.4x APO II")   }
+        { 0x00, N_("None")                                },
+        { 0x04, N_("Minolta/Sony AF 1.4x APO (D) (0x04)") },
+        { 0x05, N_("Minolta/Sony AF 2x APO (D) (0x05)")   },
+        { 0x48, N_("Minolta/Sony AF 2x APO (D)")          },
+        { 0x50, N_("Minolta AF 2x APO II")                },
+        { 0x60, N_("Minolta AF 2x APO")                   },
+        { 0x88, N_("Minolta/Sony AF 1.4x APO (D)")        },
+        { 0x90, N_("Minolta AF 1.4x APO II")              },
+        { 0xa0, N_("Minolta AF 1.4x APO")                 }
     };
 
     std::ostream& printMinoltaSonyTeleconverterModel(std::ostream& os, const Value& value, const ExifData* metadata)

-- 
exiv2 packaging