[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=1196e0a

The following commit has been merged in the master branch:
commit 1196e0aee3cb95cdc3c5c30dbc853ff863716446
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Nov 24 12:23:39 2004 +0000

    Fixed Ifd::size() and Ifd::copy() to handle an empty IFD consistently.
---
 src/ifd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index a736071..3dc782a 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -465,6 +465,7 @@ namespace Exiv2 {
 
     long Ifd::copy(byte* buf, ByteOrder byteOrder, long offset)
     {
+        if (entries_.size() == 0 && next_ == 0) return 0;
         if (offset != 0) offset_ = offset;
 
         // Add the number of entries to the data buffer
@@ -581,7 +582,7 @@ namespace Exiv2 {
 
     long Ifd::size() const
     {
-        if (entries_.size() == 0) return 0;
+        if (entries_.size() == 0 && next_ == 0) return 0;
         return static_cast<long>(2 + 12 * entries_.size() + 4); 
     }
 

-- 
exiv2 packaging