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

The following commit has been merged in the master branch:
commit bcf10895aa510db268f6def5f5118b8337296b89
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 25 06:03:07 2005 +0000

    Relaxed Iptc parsing to be able to read certain broken images
---
 src/iptc.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/iptc.cpp b/src/iptc.cpp
index 6dc34c9..059f3e7 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -143,10 +143,13 @@ namespace Exiv2 {
         byte extTest = 0;
 
         while (pRead + 3 < buf + len) {
-            if (*pRead++ != marker_) return 5;
+            // First byte should be a marker. If it isn't, scan forward and skip
+            // the chunk bytes present in some images. This deviates from the
+            // standard, which advises to treat such cases as errors.
+            if (*pRead++ != marker_) continue;
             record = *pRead++;
             dataSet = *pRead++;
-            
+
             extTest = *pRead;
             if (extTest & 0x80) {
                 // extended dataset

-- 
exiv2 packaging