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

The following commit has been merged in the master branch:
commit a82fa51c8c55997eebd71d010b9f2281a47ffc88
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 26 18:17:17 2015 +0000

    #900.  Preserve XMP data in TIFF files when XMPsdk is not build into the library.
---
 src/tiffvisitor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index e93cef1..4a6a148 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -520,7 +520,7 @@ namespace Exiv2 {
           pRoot_(pRoot),
           isNewImage_(isNewImage),
           pPrimaryGroups_(pPrimaryGroups),
-          pSourceTree_(0),          
+          pSourceTree_(0),
           findEncoderFct_(findEncoderFct),
           dirty_(false),
           writeMethod_(wmNonIntrusive)
@@ -610,6 +610,7 @@ namespace Exiv2 {
 
     void TiffEncoder::encodeXmp()
     {
+#ifdef EXV_HAVE_XMP_TOOLKIT
         ExifKey xmpKey("Exif.Image.XMLPacket");
         // Remove any existing XMP Exif tag
         ExifData::iterator pos = exifData_.findKey(xmpKey);
@@ -632,6 +633,7 @@ namespace Exiv2 {
             Exifdatum xmpDatum(xmpKey, value.get());
             exifData_.add(xmpDatum);
         }
+#endif
     } // TiffEncoder::encodeXmp
 
     void TiffEncoder::setDirty(bool flag)

-- 
exiv2 packaging