[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=884b435

The following commit has been merged in the master branch:
commit 884b4355bba708b14bd6e2670a86784068935845
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Aug 12 14:45:21 2007 +0000

    Added support for Olympus ORF format (Jeff Costlow).
---
 src/Makefile                        |   1 +
 src/cr2image.cpp                    |  41 +++++++-------
 src/cr2image.hpp                    |  43 +++------------
 src/image.cpp                       |   2 +
 src/makernote2.cpp                  |   2 +-
 src/{tiffimage.cpp => orfimage.cpp} | 103 +++++++++++++++++++-----------------
 src/{mrwimage.hpp => orfimage.hpp}  |  68 ++++++++++++++++--------
 src/tags.cpp                        |   3 ++
 src/tifffwd.hpp                     |   1 +
 src/tiffimage.cpp                   |  72 ++++++++++++++++++++++---
 src/tiffimage.hpp                   |  71 ++++++++++++++++---------
 src/tiffparse.cpp                   |   2 +-
 src/tiffparser.cpp                  |  17 ++++--
 src/tiffparser.hpp                  |   5 +-
 test/data/exiv2-test.out            |  30 +++++------
 15 files changed, 279 insertions(+), 182 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 43d602a..ae9217d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -75,6 +75,7 @@ CCSRC =  basicio.cpp          \
 	 mrwimage.cpp         \
 	 nikonmn.cpp          \
 	 olympusmn.cpp        \
+	 orfimage.cpp         \
 	 panasonicmn.cpp
 ifdef HAVE_LIBZ
 CCSRC += pngimage.cpp         \
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 78a9ea2..8c15560 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -125,8 +125,10 @@ namespace Exiv2 {
             throw Error(3, "CR2");
         }
         clearMetadata();
+        Cr2Header cr2Header;
         TiffParser::decode(this, io_->mmap(), io_->size(),
-                           TiffCreator::create, Cr2Decoder::findDecoder);
+                           TiffCreator::create, Cr2Decoder::findDecoder,
+                           &cr2Header);
 
     } // Cr2Image::readMetadata
 
@@ -136,44 +138,43 @@ namespace Exiv2 {
         throw(Error(31, "CR2"));
     } // Cr2Image::writeMetadata
 
-    const uint16_t Cr2Header::tag_ = 42;
     const char* Cr2Header::cr2sig_ = "CR

-- 
exiv2 packaging