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

The following commit has been merged in the master branch:
commit d82216eed6889e88e837db9cb963427067a1a3c9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Oct 8 18:03:45 2007 +0000

    Added Pentax makernote header to new TIFF parser.
---
 src/makernote2.cpp    | 38 ++++++++++++++++++++++++++++++++++++++
 src/makernote2.hpp    | 38 ++++++++++++++++++++++++++++++++++++++
 src/tiffcomposite.cpp |  3 ++-
 3 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index 317a349..5419870 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -58,6 +58,7 @@ namespace Exiv2 {
         { "NIKON",          newNikonMn,     Group::nikonmn   },
         { "OLYMPUS",        newOlympusMn,   Group::olympmn   },
         { "Panasonic",      newPanasonicMn, Group::panamn    },
+        { "PENTAX",         newPentaxMn,    Group::pentaxmn  },
         { "SIGMA",          newSigmaMn,     Group::sigmamn   },
         { "SONY",           newSonyMn,      Group::sonymn    }
     };
@@ -274,6 +275,33 @@ namespace Exiv2 {
 
     } // PanasonicMnHeader::read
 
+    const byte PentaxMnHeader::signature_[] = {
+        'A', 'O', 'C', 0x00, 'M', 'M'
+    };
+    const uint32_t PentaxMnHeader::size_ = 6;
+
+    PentaxMnHeader::PentaxMnHeader()
+    {
+        read(signature_, size_, invalidByteOrder);
+    }
+
+    bool PentaxMnHeader::read(const byte* pData,
+                              uint32_t size,
+                              ByteOrder /*byteOrder*/)
+    {
+        assert (pData != 0);
+
+        if (size < size_) return false;
+
+        header_.alloc(size_);
+        std::memcpy(header_.pData_, pData, header_.size_);
+        if (   static_cast<uint32_t>(header_.size_) < size_
+            || 0 != memcmp(header_.pData_, signature_, 3)) {
+            return false;
+        }
+        return true;
+    } // PentaxMnHeader::read
+
     const byte SigmaMnHeader::signature1_[] = {
         'S', 'I', 'G', 'M', 'A', '

-- 
exiv2 packaging