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

The following commit has been merged in the master branch:
commit bab89c1ba39268889a1c6cdafd33671b1c7fa995
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Apr 18 12:26:48 2006 +0000

    TIFF parser checkpoint (experimental): Added support for more esoteric makernotes with different byte order, base offset and their own component factory. Added Fujifilm makernote to test the byte order and base offset features. Use TiffCreator as part of a 'state' class instead of as a templated policy to be able to change the factory during a parse run.
---
 src/Makefile                        |   4 +-
 src/{olympusmn2.cpp => fujimn2.cpp} |  68 ++++++---
 src/{olympusmn2.hpp => fujimn2.hpp} |  66 +++++----
 src/makernote2.cpp                  |  17 ++-
 src/makernote2.hpp                  |  32 +++--
 src/mnreg.cpp                       |   7 +-
 src/olympusmn2.cpp                  |  14 +-
 src/olympusmn2.hpp                  |   7 +-
 src/tiffcomposite.cpp               |   1 +
 src/tiffcomposite.hpp               |  31 ++--
 src/tiffimage.cpp                   |   2 +-
 src/tiffparse.cpp                   |  18 ++-
 src/tiffparser.cpp                  |  39 +++--
 src/tiffparser.hpp                  |  59 ++------
 src/tiffvisitor.cpp                 | 274 ++++++++++++++++++++++++++++++++++-
 src/tiffvisitor.hpp                 | 107 ++++++++++----
 src/tiffvisitor_tmpl.hpp            | 277 ------------------------------------
 17 files changed, 563 insertions(+), 460 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a75a0f2..7d9a76a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,11 +47,11 @@ include $(top_srcdir)/config/config.mk
 # Source files
 
 # Add standalone C++ header files to this list
-CCHDR = exv_conf.h exv_msvc.h mn.hpp rcsid.hpp tiffvisitor_tmpl.hpp
+CCHDR = exv_conf.h exv_msvc.h mn.hpp rcsid.hpp
 
 # Add library C++ source files to this list
 CCSRC = basicio.cpp canonmn.cpp crwimage.cpp datasets.cpp error.cpp exif.cpp \
-	futils.cpp fujimn.cpp ifd.cpp image.cpp imgreg.cpp iptc.cpp \
+	futils.cpp fujimn.cpp fujimn2.cpp ifd.cpp image.cpp imgreg.cpp iptc.cpp \
 	jpgimage.cpp makernote.cpp makernote2.cpp metadatum.cpp mnreg.cpp \
 	nikonmn.cpp olympusmn.cpp olympusmn2.cpp panasonicmn.cpp sigmamn.cpp \
 	sonymn.cpp tags.cpp tiffcomposite.cpp tiffimage.cpp tiffparser.cpp \
diff --git a/src/olympusmn2.cpp b/src/fujimn2.cpp
similarity index 53%
copy from src/olympusmn2.cpp
copy to src/fujimn2.cpp
index 1116527..043a5e5 100644
--- a/src/olympusmn2.cpp
+++ b/src/fujimn2.cpp
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*
-  File:      olympusmn2.cpp
+  File:      fujimn2.cpp
   Version:   $Rev$
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
-  History:   11-Apr-06, ahu: created
+  History:   15-Apr-06, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
@@ -40,8 +40,9 @@ EXIV2_RCSID("@(#) $Id$");
 # include "exv_conf.h"
 #endif
 
-#include "olympusmn2.hpp"
+#include "fujimn2.hpp"
 #include "tiffcomposite.hpp"
+#include "tiffparser.hpp"
 #include "types.hpp"
 
 // + standard includes
@@ -52,15 +53,18 @@ EXIV2_RCSID("@(#) $Id$");
 // class member definitions
 namespace Exiv2 {
 
-    const char* OlympusMnHeader::signature_ = "OLYMP

-- 
exiv2 packaging