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

The following commit has been merged in the master branch:
commit b4c7c6da6de40dfecfb26c5afaef8a8fb94a181e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Apr 24 16:55:08 2006 +0000

    New TIFF parser: Added Nikon 3 Makernote and minor tweaks
---
 src/Makefile                       |  1 +
 src/fujimn2.cpp                    | 12 +++---
 src/fujimn2.hpp                    |  8 ++--
 src/mnreg.cpp                      |  2 +
 src/{canonmn2.cpp => nikonmn2.cpp} | 86 ++++++++++++++++++++++----------------
 src/{fujimn2.hpp => nikonmn2.hpp}  | 78 +++++++++++++++++++---------------
 src/tiffcomposite.cpp              |  3 ++
 src/tiffimage.hpp                  |  4 +-
 src/tiffparse.cpp                  |  2 +-
 src/tiffparser.cpp                 |  4 +-
 src/tiffvisitor.cpp                |  2 +
 11 files changed, 118 insertions(+), 84 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 8d94438..b49e545 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -73,6 +73,7 @@ CCSRC = basicio.cpp           \
 	metadatum.cpp         \
 	mnreg.cpp             \
 	nikonmn.cpp           \
+	nikonmn2.cpp          \
 	olympusmn.cpp         \
 	olympusmn2.cpp        \
 	panasonicmn.cpp       \
diff --git a/src/fujimn2.cpp b/src/fujimn2.cpp
index 02055e2..3d29923 100644
--- a/src/fujimn2.cpp
+++ b/src/fujimn2.cpp
@@ -53,13 +53,15 @@ EXIV2_RCSID("@(#) $Id$");
 // class member definitions
 namespace Exiv2 {
 
-    const char* FujiMnHeader::signature_ = "FUJIFILM


-- 
exiv2 packaging