[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=8489cec

The following commit has been merged in the master branch:
commit 8489cec20c3de6c43da12b067fd4099e97e06ce1
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jun 26 15:35:16 2008 +0000

    Filter unwanted tags in ExifParser::encode.
---
 src/exif.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index c0dea5a..1f4159c 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -445,13 +445,25 @@ namespace Exiv2 {
         const ExifData& exifData
     )
     {
+        static const char* filteredTags[] = {
+            "Exif.Image.StripOffsets",
+            "Exif.Image.RowsPerStrip",
+            "Exif.Image.StripByteCounts"
+        };
+
+        ExifData ed = exifData;
+        for (unsigned int i = 0; i < EXV_COUNTOF(filteredTags); ++i) {
+            ExifData::iterator pos = ed.findKey(ExifKey(filteredTags[i]));
+            if (pos != ed.end()) ed.erase(pos);
+        }
+
         const IptcData iptcData;
         const XmpData  xmpData;
         return TiffParser::encode(blob,
                                   pData,
                                   size,
                                   byteOrder,
-                                  exifData,
+                                  ed,
                                   iptcData,
                                   xmpData);
     } // ExifParser::encode

-- 
exiv2 packaging