[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=4a304e9

The following commit has been merged in the master branch:
commit 4a304e9265fef4e468342aa831f5671fdc7a6083
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Apr 24 17:49:49 2006 +0000

    New TIFF parser: Added Nikon 1 and Nikon 2 Makernotes
---
 src/mnreg.cpp     |  2 +-
 src/nikonmn2.cpp  | 57 ++++++++++++++++++++++++++++++++++++---
 src/nikonmn2.hpp  | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/tiffimage.hpp |  2 ++
 4 files changed, 135 insertions(+), 5 deletions(-)

diff --git a/src/mnreg.cpp b/src/mnreg.cpp
index 6f50155..6c315b5 100644
--- a/src/mnreg.cpp
+++ b/src/mnreg.cpp
@@ -46,7 +46,7 @@ namespace Exiv2 {
     const TiffMnRegistry TiffMnCreator::registry_[] = {
         { "Canon",    newCanonMn,   Group::canonmn  },
         { "FUJIFILM", newFujiMn,    Group::fujimn   },
-        { "NIKON",    newNikonMn,   Group::nikon3mn },
+        { "NIKON",    newNikonMn,   Group::nikonmn  },
         { "OLYMPUS",  newOlympusMn, Group::olympmn  }
     };
 
diff --git a/src/nikonmn2.cpp b/src/nikonmn2.cpp
index 315f3ca..fa8955c 100644
--- a/src/nikonmn2.cpp
+++ b/src/nikonmn2.cpp
@@ -46,6 +46,43 @@ EXIV2_RCSID("@(#) $Id$");
 // class member definitions
 namespace Exiv2 {
 
+    const byte Nikon2MnHeader::signature_[] = {
+        'N', 'i', 'k', 'o', 'n', '

-- 
exiv2 packaging