[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=448177d

The following commit has been merged in the master branch:
commit 448177d0979ab375ba8ddaeec451df4bcde82bfc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Apr 29 11:37:53 2006 +0000

    New TIFF parser: Added simple IFD based Sony Makernote
---
 src/makernote2.cpp    | 11 ++++++++---
 src/makernote2.hpp    |  5 +++--
 src/tiffcomposite.cpp |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index aae68b9..4fe3b87 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -405,11 +405,16 @@ namespace Exiv2 {
     TiffComponent* newSonyMn(uint16_t    tag,
                              uint16_t    group,
                              uint16_t    mnGroup,
-                             const byte* /*pData*/,
-                             uint32_t    /*size*/, 
+                             const byte* pData,
+                             uint32_t    size,
                              ByteOrder   /*byteOrder*/)
     {
-        return new TiffIfdMakernote(tag, group, mnGroup, new SonyMnHeader);
+        // If there is no "SONY DSC " string we assume it's a simple IFD Makernote
+        if (size < 12 ||   std::string(reinterpret_cast<const char*>(pData), 12)
+                        != std::string("SONY DSC 

-- 
exiv2 packaging