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

The following commit has been merged in the master branch:
commit e28afc04b3437226fdcbeab1859a3c5abd61f5e0
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Jul 29 12:42:19 2008 +0000

    add warning message if Exif data cannot be decoded. Also, reset exif data from image instance in thios case.
---
 src/pngchunk.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index f31c00d..d21f6c2 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -257,7 +257,7 @@ namespace Exiv2
                 if (pos !=-1)
                 {
 #ifdef DEBUG
-                    std::cout << "Exiv2::PngChunk::decode: Exif header found at position " << pos << "
";
+                    std::cout << "Exiv2::PngChunk::parseChunkContent: Exif header found at position " << pos << "
";
 #endif
                     pos = pos + sizeof(exifHeader);
                     ByteOrder bo = TiffParser::decode(pImage->exifData(),
@@ -267,6 +267,13 @@ namespace Exiv2
                                                       length - pos);
                     pImage->setByteOrder(bo);
                 }
+                else
+                {
+#ifndef SUPPRESS_WARNINGS
+                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Failed to decode Exif metadata.
";
+#endif
+                    pImage->exifData().clear();
+                }
             }
         }
 
@@ -298,15 +305,15 @@ namespace Exiv2
                 if (idx != std::string::npos && idx > 0)
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Removing " << idx << " characters "
-                              << "from the beginning of the XMP packet
";
+                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Removing " << idx 
+                              << " characters from the beginning of the XMP packet
";
 #endif
                     xmpPacket = xmpPacket.substr(idx);
                 }
                 if (XmpParser::decode(pImage->xmpData(), xmpPacket)) 
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode XMP metadata.
";
+                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Failed to decode XMP metadata.
";
 #endif
                 }
             }

-- 
exiv2 packaging