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

The following commit has been merged in the master branch:
commit fb96576155954f72488e3cccbd4ed29edf6156e4
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Sep 21 11:07:10 2014 +0000

    Issue #919: Handle Pentax makernotes in samsung-rebranded cameras. Thanks goes to Michael Karcher for the patch.
---
 src/makernote.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 31f6e2e..32e23be 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -956,13 +956,23 @@ namespace Exiv2 {
     TiffComponent* newSamsungMn(uint16_t    tag,
                                 IfdId       group,
                                 IfdId       mnGroup,
-                                const byte* /*pData*/,
+                                const byte* pData,
                                 uint32_t    size,
                                 ByteOrder   /*byteOrder*/)
     {
-        // Require at least an IFD with 1 entry
-        if (size < 18) return 0;
-        return newSamsungMn2(tag, group, mnGroup);
+        if (   size > 4
+            && std::string(reinterpret_cast<const char*>(pData), 4) == std::string("AOC

-- 
exiv2 packaging