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

The following commit has been merged in the master branch:
commit b3d0d5cf826de635a126c02c80f8ba48dd3864d5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 10 16:37:55 2008 +0000

    #542: Use the first Exif APP1 segment (not the last) if more than one are present.
---
 src/jpgimage.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 570be2c..a2c449b 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -283,6 +283,7 @@ namespace Exiv2 {
         DataBuf buf(bufMinSize);
         Blob iptcBlob;
         bool foundPsData = false;
+        bool foundExifData = false;
 
         // Read section marker
         int marker = advanceToMarker();
@@ -305,7 +306,8 @@ namespace Exiv2 {
                 if (--search == 0) break;
             }
 
-            if (marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
+            if (   !foundExifData
+                && marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
                 if (size < 8) {
                     rc = 1;
                     break;
@@ -324,6 +326,7 @@ namespace Exiv2 {
                     exifData_.clear();
                 }
                 --search;
+                foundExifData = true;
             }
             else if (marker == app1_ && memcmp(buf.pData_ + 2, xmpId_, 29) == 0) {
                 if (size < 31) {
@@ -511,7 +514,8 @@ namespace Exiv2 {
                 insertPos = count + 1;
                 if (io_->seek(size-bufRead, BasicIo::cur)) throw Error(22);
             }
-            else if (marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
+            else if (   skipApp1Exif == -1
+                     && marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
                 if (size < 8) throw Error(22);
                 skipApp1Exif = count;
                 ++search;

-- 
exiv2 packaging