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

The following commit has been merged in the master branch:
commit fcd94e2eeee45449df9dab6fedc0a20a2652b06b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Feb 3 15:13:13 2009 +0000

    Fixed count of makernote tag. Fixes bug #615.
---
 src/tiffcomposite.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 55b0727..0829103 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -688,9 +688,13 @@ namespace Exiv2 {
 
     uint32_t TiffMnEntry::doCount() const
     {
-        // Count of tag Exif.Photo.MakerNote is the size of the Makernote in bytes
+        if (!mn_) {
+            return TiffEntryBase::doCount();
+        }
+        // Count of IFD makernote in tag Exif.Photo.MakerNote is the size of the
+        // Makernote in bytes
         assert(tiffType() == ttUndefined);
-        return size();
+        return mn_->size();
     }
 
     uint32_t TiffArrayEntry::doCount() const

-- 
exiv2 packaging