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

The following commit has been merged in the master branch:
commit 4cb74a42e5d5af5fa0781870ddbc3c6129e1bc91
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 24 02:32:25 2004 +0000

    * Replaced too simple prefix with a more general concept of a makernote header.
    * Code and documentation cleanup.
---
 src/fujimn.cpp | 40 ++++++++++++++++++++++++++++++++++------
 src/fujimn.hpp | 20 ++++++++++++++------
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 29e2ca0..3d3519b 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      fujimn.cpp
-  Version:   $Name:  $ $Revision: 1.5 $
+  Version:   $Name:  $ $Revision: 1.6 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -31,7 +31,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: fujimn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.6 $ $RCSfile: fujimn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -44,6 +44,7 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: fujimn.cpp,v $")
 #include <string>
 #include <sstream>
 #include <iomanip>
+#include <cassert>
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -79,14 +80,41 @@ namespace Exiv2 {
     FujiMakerNote::FujiMakerNote(bool alloc)
         : IfdMakerNote(fujiMnTagInfo, alloc), sectionName_("Fujifilm")
     {
-        setByteOrder(littleEndian);
-        prefix_ = std::string("FUJIFILM\xc

-- 
exiv2 packaging