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

The following commit has been merged in the master branch:
commit ae501bba1c7277e4affc7509e3abbae3a141bab5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Feb 9 14:44:01 2011 +0000

    #759: Undid r2444. Instead, don't encode any tags larger than 40kB as a last resort when writing to JPEGs.
---
 src/exif.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 6fd2b0f..ba51c60 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -670,8 +670,7 @@ namespace Exiv2 {
             "Exif.Image.StripByteCounts",
             "Exif.Image.JPEGInterchangeFormat",
             "Exif.Image.JPEGInterchangeFormatLength",
-            "Exif.Image.SubIFDs",
-            "Exif.Image.DNGPrivateData"
+            "Exif.Image.SubIFDs"
         };
         for (unsigned int i = 0; i < EXV_COUNTOF(filteredIfd0Tags); ++i) {
             ExifData::iterator pos = ed.findKey(ExifKey(filteredIfd0Tags[i]));
@@ -794,10 +793,10 @@ namespace Exiv2 {
             }
         }
 
-        // Delete unknown tags larger than 4kB.
+        // Delete unknown tags larger than 4kB and known tags larger than 40kB.
         for (ExifData::iterator pos = ed.begin(); pos != ed.end(); ) {
-            if (   pos->size() > 4096
-                && pos->tagName().substr(0, 2) == "0x") {
+            if (   (pos->size() > 4096 && pos->tagName().substr(0, 2) == "0x")
+                || pos->size() > 40960) {
 #ifndef SUPPRESS_WARNINGS
                 EXV_WARNING << "Exif tag " << pos->key() << " not encoded
";
 #endif

-- 
exiv2 packaging