[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=177bd4f

The following commit has been merged in the master branch:
commit 177bd4ffdea51d821d0c4013b56af88439d4a774
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Oct 10 14:38:24 2008 +0000

    Added synthesized tag Exif.MakerNote.ByteOrder.
---
 src/makernote.cpp           |  3 +-
 src/makernote_int.hpp       | 15 +++++++---
 src/tags.cpp                |  5 +++-
 src/tiffvisitor.cpp         | 28 +++++++++++++++---
 test/data/bugfixes-test.out |  2 ++
 test/data/exifdata-test.out |  8 ++++++
 test/data/exiv2-test.out    | 69 +++++++++++++++++++++++++++++++++++++++++++--
 test/data/write-test.out    | 66 +++++++++++++++++++++++--------------------
 test/data/write2-test.out   | 10 +++++++
 9 files changed, 163 insertions(+), 43 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index c465180..80b607a 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -129,8 +129,9 @@ namespace Exiv2 {
         return pHeader_->ifdOffset();
     }
 
-    ByteOrder TiffIfdMakernote::byteOrder () const
+    ByteOrder TiffIfdMakernote::byteOrder() const
     {
+        if (byteOrder_ != invalidByteOrder) return byteOrder_;
         if (!pHeader_) return invalidByteOrder;
         return pHeader_->byteOrder();
     }
diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp
index aacbd69..3758604 100644
--- a/src/makernote_int.hpp
+++ b/src/makernote_int.hpp
@@ -214,7 +214,8 @@ namespace Exiv2 {
             : TiffComponent(tag, group),
               pHeader_(pHeader),
               ifd_(tag, mnGroup, hasNext),
-              mnOffset_(0) {}
+              mnOffset_(0),
+              byteOrder_(invalidByteOrder) {}
         //! Virtual destructor
         virtual ~TiffIfdMakernote();
         //@}
@@ -247,9 +248,14 @@ namespace Exiv2 {
          */
         uint32_t ifdOffset() const;
         /*!
-          @brief Return the byte order for the makernote. Default (if there is
-                 no header) is invalidByteOrder. This means that the byte order
-                 of the the image should be used for the makernote.
+          @brief Return the byte order for the makernote.
+
+          After the makernote has been read, this returns the actual byte order
+          of the makernote, either 
-- 
exiv2 packaging