[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=12d074f

The following commit has been merged in the master branch:
commit 12d074fff050811430a6d06c84251b29f5693c22
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 16 16:39:54 2008 +0000

    Some more cleanup.
---
 src/tiffcomposite.cpp | 52 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 3f55793..0d41a8b 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -775,18 +775,7 @@ namespace Exiv2 {
 
         // 3rd: Write data - may contain offsets too (eg sub-IFD)
         dataIdx = sizeDir + sizeValue;
-        for (Components::const_iterator i = components_.begin(); i != components_.end(); ++i) {
-            uint32_t sd = (*i)->writeData(blob, byteOrder, offset, dataIdx, imageIdx);
-            assert((*i)->sizeData() == sd);
-            if ((sd & 1) == 1) {
-                blob.push_back(0x0);        // Align data to word boundary
-                sd += 1;
-            }
-            idx += sd;
-            dataIdx += sd;
-        }
-        // No assertion (sizeData may not be available, see above)
-        // assert(idx == sizeDir + sizeValue + sizeData);
+        idx += writeData(blob, byteOrder, offset, dataIdx, imageIdx);
 
         // 4th: Write next-IFD
         if (pNext_ && sizeNext) {
@@ -1033,15 +1022,17 @@ namespace Exiv2 {
         return doWriteData(blob, byteOrder, offset, dataIdx, imageIdx);
     } // TiffComponent::writeData
 
-    uint32_t TiffDirectory::doWriteData(Blob&     /*blob*/,
-                                        ByteOrder /*byteOrder*/,
-                                        int32_t   /*offset*/,
-                                        uint32_t  /*dataIdx*/,
-                                        uint32_t& /*imageIdx*/) const
+    uint32_t TiffDirectory::doWriteData(Blob&     blob,
+                                        ByteOrder byteOrder,
+                                        int32_t   offset,
+                                        uint32_t  dataIdx,
+                                        uint32_t& imageIdx) const
     {
-        // We don't expect this method to be called. This makes it obvious.
-        assert(false);
-        return 0;
+        uint32_t len = 0;
+        for (Components::const_iterator i = components_.begin(); i != components_.end(); ++i) {
+            len += (*i)->writeData(blob, byteOrder, offset, dataIdx + len, imageIdx);
+        }
+        return len;
     } // TiffDirectory::doWriteData
 
     uint32_t TiffEntryBase::doWriteData(Blob&     /*blob*/,
@@ -1063,7 +1054,11 @@ namespace Exiv2 {
 
         DataBuf buf = pValue()->dataArea();
         append(blob, buf.pData_, buf.size_);
-        return buf.size_;
+        // Align data to word boundary
+        uint32_t align = (buf.size_ & 1);
+        if (align) blob.push_back(0x0);
+
+        return buf.size_ + align;
     } // TiffDataEntry::doWriteData
 
     uint32_t TiffSubIfd::doWriteData(Blob&     blob,
@@ -1076,7 +1071,11 @@ namespace Exiv2 {
         for (Ifds::const_iterator i = ifds_.begin(); i != ifds_.end(); ++i) {
             len  += (*i)->write(blob, byteOrder, offset + dataIdx + len, uint32_t(-1), uint32_t(-1), imageIdx);
         }
-        return len;
+        // Align data to word boundary
+        uint32_t align = (len & 1);
+        if (align) blob.push_back(0x0);
+
+        return len + align;
     } // TiffSubIfd::doWriteData
 
     uint32_t TiffComponent::writeImage(Blob&     blob,
@@ -1112,7 +1111,7 @@ namespace Exiv2 {
             len  += (*i)->writeImage(blob, byteOrder);
         }
         return len;
-    } // TiffSubIfd::doWriteData
+    } // TiffSubIfd::doWriteImage
 
     uint32_t TiffImageEntry::doWriteImage(Blob&     blob,
                                           ByteOrder /*byteOrder*/) const
@@ -1124,11 +1123,8 @@ namespace Exiv2 {
             blob.reserve(size + sz + 65536);
         }
         // Align image data to word boundary
-        uint32_t align = 0;
-        if ((blob.size() & 1) == 1) {
-            blob.push_back(0x0);
-            align = 1;
-        }
+        uint32_t align = (blob.size() & 1);
+        if (align) blob.push_back(0x0);
 
         uint32_t len = pValue()->sizeDataArea();
         if (len > 0) {

-- 
exiv2 packaging