[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=d733056

The following commit has been merged in the master branch:
commit d73305637516366a6f4fd7184d4b88ae01cdef9d
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Sep 18 02:30:19 2016 +0000

    Fix issue #1215: Exif.CanonSi.SubjectDistance unit.
---
 src/canonmn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 44eee06..4fd7be3 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1315,7 +1315,7 @@ namespace Exiv2 {
         TagInfo(0x0010, "0x0010", "0x0010", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0011, "0x0011", "0x0011", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
-        TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance (units are not clear)"), canonSiId, makerTags, unsignedShort, 1, printSi0x0013),
+        TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance"), canonSiId, makerTags, unsignedShort, 1, printSi0x0013),
         TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiId, makerTags, unsignedShort, 1, printSi0x0015),
         TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiId, makerTags, unsignedShort, 1, printSi0x0016),
@@ -1981,7 +1981,7 @@ namespace Exiv2 {
             os << "Infinite";
         }
         else {
-            os << l << "";
+            os << value.toLong()/100.0 << " m";
         }
         os.flags(f);
         return os;

-- 
exiv2 packaging