[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=23d1c91

The following commit has been merged in the master branch:
commit 23d1c9178872a4d7019be4eac9b8a1781b7b6855
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 31 06:54:24 2006 +0000

    Fixed inaccurate error message for failure to decode Jpeg metadata
---
 src/error.cpp    | 1 +
 src/jpgimage.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/error.cpp b/src/error.cpp
index 25d15ee..47218c6 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -79,6 +79,7 @@ namespace Exiv2 {
         ErrMsg( 33, "This does not look like a CRW image"),
         ErrMsg( 34, "%1: Not supported"), // %1=function
         ErrMsg( 35, "ImageFactory registry full"),
+        ErrMsg( 36, "Failed to decode %1 metadata"), // %1=type of metadata (Exif, IPTC)
 
         // Last error message (message is not used)
         ErrMsg( -2, "(Unknown Error)")
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index d6e2173..db9a8c5 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -184,7 +184,7 @@ namespace Exiv2 {
                 DataBuf rawExif(sizeExifData);
                 io_->read(rawExif.pData_, sizeExifData);
                 if (io_->error() || io_->eof()) throw Error(14);
-                if (exifData_.load(rawExif.pData_, sizeExifData)) throw Error(15);
+                if (exifData_.load(rawExif.pData_, sizeExifData)) throw Error(36, "Exif");
                 --search;
             }
             else if (marker == app13_ && memcmp(buf.pData_ + 2, ps3Id_, 14) == 0) {
@@ -201,7 +201,7 @@ namespace Exiv2 {
                 if (!locateIptcData(psData.pData_, psData.size_, &record,
                             &sizeHdr, &sizeIptc)) {
                     assert(sizeIptc);
-                    if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(15);
+                    if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
                 }
                 --search;
             }

-- 
exiv2 packaging