[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=5ef4c5e

The following commit has been merged in the master branch:
commit 5ef4c5ee22337aafe78a3cc5644ac91e00218e01
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 28 15:19:16 2009 +0000

    533: Applied patch 1_handle_empty_IRB (Michael Ulbrich, Volker Grabsch)
---
 src/jpgimage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 6a95e41..75f4dab 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -106,7 +106,7 @@ namespace Exiv2 {
         std::cerr << "Photoshop::locateIrb: ";
 #endif
         // Data should follow Photoshop format, if not exit
-        while (   position <= sizePsData - 14
+        while (   position <= sizePsData - 12
                && memcmp(pPsData + position, Photoshop::bimId_, 4) == 0) {
             const byte *hrd = pPsData + position;
             position += 4;
@@ -373,10 +373,10 @@ namespace Exiv2 {
                                                         &record,
                                                         &sizeHdr,
                                                         &sizeIptc)) {
-                    if (sizeIptc) {
 #ifdef DEBUG
-                        std::cerr << "Found IPTC IRB, size = " << sizeIptc << "
";
+                    std::cerr << "Found IPTC IRB, size = " << sizeIptc << "
";
 #endif
+                    if (sizeIptc) {
                         append(iptcBlob, record + sizeHdr, sizeIptc);
                     }
                     pCur = record + sizeHdr + sizeIptc;

-- 
exiv2 packaging