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

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

    * Replaced too simple prefix with a more general concept of a makernote header.
    * Added "FOVEON" and "*" to registry.
    * Code and documentation cleanup.
---
 src/sigmamn.cpp | 46 +++++++++++++++++++++++++++++++++++++---------
 src/sigmamn.hpp | 20 +++++++++++++++-----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index 96b04ff..0563cf1 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      sigmamn.cpp
-  Version:   $Name:  $ $Revision: 1.4 $
+  Version:   $Name:  $ $Revision: 1.5 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   02-Apr-04, ahu: created
   Credits:   Sigma and Foveon MakerNote implemented according to the specification
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: sigmamn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: sigmamn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -42,6 +42,7 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: sigmamn.cpp,v $")
 #include <string>
 #include <sstream>
 #include <iomanip>
+#include <cassert>
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -84,15 +85,42 @@ namespace Exiv2 {
     SigmaMakerNote::SigmaMakerNote(bool alloc)
         : IfdMakerNote(sigmaMnTagInfo, alloc), sectionName_("Sigma")
     {
-        // My one and only Sigma sample has two undocumented extra bytes 
-        // (0x01, 0x00) between the ID string and the start of the
-        // Makernote IFD. Adding them to the ID string is a hack...
-        prefix_ = std::string("SIGMA

-- 
exiv2 packaging