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

The following commit has been merged in the master branch:
commit 4e7f2ee7d97a8bf0cd0c750a43d4fd0f3bd0d20e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 26 04:19:02 2006 +0000

    New TIFF parser: Added Panasonic, Sigma and Sony makernotes
---
 src/Makefile                             |  3 ++
 src/makernote2.hpp                       |  7 +++-
 src/mnreg.cpp                            | 15 +++++--
 src/{olympusmn2.cpp => panasonicmn2.cpp} | 62 ++++++++++++++--------------
 src/{fujimn2.hpp => panasonicmn2.hpp}    | 68 ++++++++++++++-----------------
 src/{olympusmn2.cpp => sigmamn2.cpp}     | 70 ++++++++++++++++----------------
 src/{fujimn2.hpp => sigmamn2.hpp}        | 69 +++++++++++++++----------------
 src/{olympusmn2.cpp => sonymn2.cpp}      | 62 ++++++++++++++--------------
 src/{fujimn2.hpp => sonymn2.hpp}         | 56 ++++++++++++-------------
 src/tiffcomposite.cpp                    |  4 ++
 src/tiffparser.cpp                       |  1 +
 src/tiffvisitor.cpp                      |  5 ++-
 12 files changed, 210 insertions(+), 212 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b49e545..6ded735 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -77,8 +77,11 @@ CCSRC = basicio.cpp           \
 	olympusmn.cpp         \
 	olympusmn2.cpp        \
 	panasonicmn.cpp       \
+	panasonicmn2.cpp      \
 	sigmamn.cpp           \
+	sigmamn2.cpp          \
 	sonymn.cpp            \
+	sonymn2.cpp           \
 	tags.cpp              \
 	tiffcomposite.cpp     \
 	tiffimage.cpp         \
diff --git a/src/makernote2.hpp b/src/makernote2.hpp
index 578fc64..94a5dc4 100644
--- a/src/makernote2.hpp
+++ b/src/makernote2.hpp
@@ -145,8 +145,11 @@ namespace Exiv2 {
         //! @name Creators
         //@{
         //! Default constructor
-        TiffIfdMakernote(uint16_t tag, uint16_t group, uint16_t mnGroup)
-            : TiffComponent(tag, group), ifd_(tag, mnGroup) {}
+        TiffIfdMakernote(uint16_t tag, 
+                         uint16_t group, 
+                         uint16_t mnGroup, 
+                         bool     hasNext =true)
+            : TiffComponent(tag, group), ifd_(tag, mnGroup, hasNext) {}
         //! Virtual destructor
         virtual ~TiffIfdMakernote() =0;
         //@}
diff --git a/src/mnreg.cpp b/src/mnreg.cpp
index 6c315b5..dcf04f9 100644
--- a/src/mnreg.cpp
+++ b/src/mnreg.cpp
@@ -36,6 +36,9 @@ EXIV2_RCSID("@(#) $Id$");
 #include "fujimn2.hpp"
 #include "nikonmn2.hpp"
 #include "olympusmn2.hpp"
+#include "panasonicmn2.hpp"
+#include "sigmamn2.hpp"
+#include "sonymn2.hpp"
 
 // + standard includes
 
@@ -44,10 +47,14 @@ EXIV2_RCSID("@(#) $Id$");
 namespace Exiv2 {
 
     const TiffMnRegistry TiffMnCreator::registry_[] = {
-        { "Canon",    newCanonMn,   Group::canonmn  },
-        { "FUJIFILM", newFujiMn,    Group::fujimn   },
-        { "NIKON",    newNikonMn,   Group::nikonmn  },
-        { "OLYMPUS",  newOlympusMn, Group::olympmn  }
+        { "Canon",     newCanonMn,     Group::canonmn },
+        { "FOVEON",    newSigmaMn,     Group::sigmamn },
+        { "FUJIFILM",  newFujiMn,      Group::fujimn  },
+        { "NIKON",     newNikonMn,     Group::nikonmn },
+        { "OLYMPUS",   newOlympusMn,   Group::olympmn },
+        { "Panasonic", newPanasonicMn, Group::panamn  },
+        { "SIGMA",     newSigmaMn,     Group::sigmamn },
+        { "SONY",      newSonyMn,      Group::sonymn  }
     };
 
 
diff --git a/src/olympusmn2.cpp b/src/panasonicmn2.cpp
similarity index 59%
copy from src/olympusmn2.cpp
copy to src/panasonicmn2.cpp
index 6998e98..0514af2 100644
--- a/src/olympusmn2.cpp
+++ b/src/panasonicmn2.cpp
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*
-  File:      olympusmn2.cpp
+  File:      panasonicmn2.cpp
   Version:   $Rev$
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
-  History:   15-Apr-06, ahu: created
+  History:   18-Apr-06, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
@@ -40,51 +40,49 @@ EXIV2_RCSID("@(#) $Id$");
 # include "exv_conf.h"
 #endif
 
-#include "olympusmn2.hpp"
+#include "panasonicmn2.hpp"
 #include "tiffcomposite.hpp"
 #include "types.hpp"
 
 // + standard includes
-#include <cstring>
-#include <cassert>
 
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
 
-    const char* OlympusMnHeader::signature_ = "OLYMP

-- 
exiv2 packaging