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

The following commit has been merged in the master branch:
commit e1eedc0f26628141dd4f364ebf8ea088bc49dd20
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Apr 15 13:18:20 2006 +0000

    TIFF parser (experimental): Added TiffIfdMakernote base class, added separate files for Olympus makernote and the makernote registry
---
 src/Makefile                           |   8 +--
 src/makernote2.cpp                     |  67 ++++--------------
 src/makernote2.hpp                     | 104 +++++++++++++--------------
 src/{imgreg.cpp => mnreg.cpp}          |  38 +++++++---
 src/{makernote2.cpp => olympusmn2.cpp} |  49 ++++---------
 src/olympusmn2.hpp                     | 125 +++++++++++++++++++++++++++++++++
 src/tiffcomposite.cpp                  |  20 +++---
 src/tiffcomposite.hpp                  |  24 +++----
 src/tiffparser.cpp                     |  14 ++--
 src/tiffparser.hpp                     |   4 +-
 src/tiffvisitor.cpp                    |  18 ++---
 src/tiffvisitor.hpp                    |  34 ++++-----
 src/tiffvisitor_tmpl.hpp               |  18 ++---
 13 files changed, 294 insertions(+), 229 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 080d296..a75a0f2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -52,10 +52,10 @@ CCHDR = exv_conf.h exv_msvc.h mn.hpp rcsid.hpp tiffvisitor_tmpl.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 \
-	jpgimage.cpp makernote.cpp makernote2.cpp metadatum.cpp nikonmn.cpp \
-	olympusmn.cpp panasonicmn.cpp sigmamn.cpp sonymn.cpp tags.cpp \
-	tiffcomposite.cpp tiffimage.cpp tiffparser.cpp tiffvisitor.cpp \
-	types.cpp value.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 \
+	tiffvisitor.cpp types.cpp value.cpp
 
 # Add library C source files to this list
 ifndef HAVE_TIMEGM
diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index 9eca37a..10fc4ce 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -46,89 +46,46 @@ EXIV2_RCSID("@(#) $Id$");
 
 // + standard includes
 #include <string>
-#include <cstring>
 
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
 
-    const TiffMnRegistry TiffMnCreator::registry_[] = {
-        { "OLYMPUS", newOlympusMn }
-    };
-
     bool TiffMnRegistry::operator==(const TiffMnRegistry::Key& key) const
     {
         std::string make(make_);
         return make == key.make_.substr(0, make.length());
     }
 
-    TiffComponent* TiffMnCreator::create(uint16_t    tag,
-                                         uint16_t    group,
-                                         std::string make,
-                                         const byte* pData,
-                                         uint32_t    size,
-                                         ByteOrder   byteOrder)
-    {
-        TiffComponent* tc = 0;
-        const TiffMnRegistry* tmr = find(registry_, TiffMnRegistry::Key(make));
-        if (tmr) tc = tmr->newMnFct_(tag, group, pData, size, byteOrder);
-        return tc;
-    } // TiffMnCreator::create
-
-    const char* OlympusMnHeader::signature_ = "OLYMP

-- 
exiv2 packaging