[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=bc5e3fb

The following commit has been merged in the master branch:
commit bc5e3fbd5daf8f43723580da76b3826c8e0bf019
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Sep 19 13:38:08 2007 +0000

    Bugfix.
---
 src/jpgimage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 440c683..d085d43 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -467,7 +467,8 @@ namespace Exiv2 {
         }
 
         if (exifData_.count() > 0) ++search;
-        if (xmpData_.count() > 0) ++search;
+        if (writeXmpFromPacket() == false && xmpData_.count() > 0) ++search;
+        if (writeXmpFromPacket() == true && xmpPacket_.size() > 0) ++search;
         if (iptcData_.count() > 0) ++search;
         if (!comment_.empty()) ++search;
 

-- 
exiv2 packaging