[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=8caffa8

The following commit has been merged in the master branch:
commit 8caffa8eb41b7539b9c1849f048a93080645e711
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Aug 18 11:55:41 2006 +0000

    Changed assertion to test when reading IPTC IRBs. Some images seem to have empty IPTC IRBs. Fixes bug #483.
---
 src/jpgimage.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 398518d..354c4bd 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -313,9 +313,10 @@ namespace Exiv2 {
                 uint32_t sizeHdr = 0;
                 // Find actual Iptc data within the APP13 segment
                 if (!Photoshop::locateIptcIrb(psData.pData_, psData.size_,
-                                          &record, &sizeHdr, &sizeIptc)) {
-                    assert(sizeIptc);
-                    if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
+                                              &record, &sizeHdr, &sizeIptc)) {
+                    if (sizeIptc) {
+                        if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
+                    }
                 }
                 --search;
             }

-- 
exiv2 packaging