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

The following commit has been merged in the master branch:
commit cdd6eb2765c8df1432c7ddfeab0986d358b15770
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Oct 1 11:07:44 2010 +0000

    #726: Tweak to make it select the correct primary image.
---
 src/tiffimage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index ec78062..e9341b6 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -109,8 +109,10 @@ namespace Exiv2 {
             ExifData::const_iterator md = exifData_.findKey(ExifKey(keys[i]));
             // Is it the primary image?
             if (md != exifData_.end() && md->count() > 0 && md->toLong() == 0) {
+                // Sometimes there is a JPEG primary image; that's not our first choice
                 groupName = md->groupName();
-                break;
+                std::string key = "Exif." + groupName + ".JPEGInterchangeFormat";
+                if (exifData_.findKey(ExifKey(key)) == exifData_.end()) break;
             }
         }
         return groupName;

-- 
exiv2 packaging