Fixed count of makernote tag. Fixes bug #615.

2009-02-03 15:13:13 +00:00 · 2009-02-03 15:13:13 +00:00 · fcd94e2eee
commit fcd94e2eee
parent 3bd8cde75b
1 changed files with 6 additions and 2 deletions
--- 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