[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=610d861

The following commit has been merged in the master branch:
commit 610d86133ae52320468aaf0ca69ba63c0d8822de
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Apr 26 14:06:38 2010 +0000

    #668: Fix copying of composite objects. (digiKam bug 235171)
---
 src/tiffcomposite.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index c4df6c8..15c8871 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -742,6 +742,7 @@ namespace Exiv2 {
         assert(pData != 0);
 
         if (origSize_ != size) return false;
+        if (origData_ == pData) return true;
         memcpy(origData_, pData, origSize_);
         return true;
     }
@@ -809,7 +810,7 @@ namespace Exiv2 {
         }
         if (tc == 0) {
             TiffComponent::AutoPtr atc;
-            if (object.get() != 0) {
+            if (tiffPath.size() == 1 && object.get() != 0) {
                 atc = object;
             }
             else {
@@ -854,7 +855,7 @@ namespace Exiv2 {
             }
         }
         if (tc == 0) {
-            if (object.get() != 0) {
+            if (tiffPath.size() == 2 && object.get() != 0) {
                 tc = addChild(object);
             }
             else {
@@ -924,7 +925,7 @@ namespace Exiv2 {
         }
         if (tc == 0) {
             TiffComponent::AutoPtr atc;
-            if (object.get() != 0) {
+            if (tiffPath.size() == 1 && object.get() != 0) {
                 atc = object;
             }
             else {

-- 
exiv2 packaging