From fcd94e2eeee45449df9dab6fedc0a20a2652b06b Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Tue, 3 Feb 2009 15:13:13 +0000
Subject: [PATCH] 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 55b07272..0829103d 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