[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=8b3009b

The following commit has been merged in the master branch:
commit 8b3009bacbb02c9d0cec914aed0812952fc44b76
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Feb 10 13:38:28 2009 +0000

    Filter tags that are not relevant for RAW images (Matthias Welwarsky).
---
 src/rw2image.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/rw2image.cpp b/src/rw2image.cpp
index 674e603..e81151d 100644
--- a/src/rw2image.cpp
+++ b/src/rw2image.cpp
@@ -159,6 +159,48 @@ namespace Exiv2 {
                 }
             }
         }
+        // Remove tags not applicable for raw images
+        static const char* filteredTags[] = {
+            "Exif.Photo.ComponentsConfiguration",
+            "Exif.Photo.CompressedBitsPerPixel",
+            "Exif.Panasonic.ColorEffect",
+            "Exif.Panasonic.Contrast",
+            "Exif.Panasonic.NoiseReduction",
+            "Exif.Panasonic.ColorMode",
+            "Exif.Panasonic.OpticalZoomMode",
+            "Exif.Panasonic.Contrast",
+            "Exif.Panasonic.Saturation",
+            "Exif.Panasonic.Sharpness",
+            "Exif.Panasonic.FilmMode",
+            "Exif.Panasonic.SceneMode",
+            "Exif.Panasonic.WBRedLevel",
+            "Exif.Panasonic.WBGreenLevel",
+            "Exif.Panasonic.WBBlueLevel",
+            "Exif.Photo.ColorSpace",
+            "Exif.Photo.PixelXDimension",
+            "Exif.Photo.PixelYDimension",
+            "Exif.Photo.SceneType",
+            "Exif.Photo.CustomRendered",
+            "Exif.Photo.DigitalZoomRatio",
+            "Exif.Photo.SceneCaptureType",
+            "Exif.Photo.GainControl",
+            "Exif.Photo.Contrast",
+            "Exif.Photo.Saturation",
+            "Exif.Photo.Sharpness",
+            "Exif.Image.PrintImageMatching",
+            "Exif.Image.YCbCrPositioning"
+        };
+        for (unsigned int i = 0; i < EXV_COUNTOF(filteredTags); ++i) {
+            ExifData::iterator pos = prevData.findKey(ExifKey(filteredTags[i]));
+            if (pos != prevData.end()) {
+#ifdef DEBUG
+                std::cerr << "Exif tag " << pos->key() << " removed
";
+#endif
+                prevData.erase(pos);
+            }
+        }
+
+        // Add the remaining tags
         for (ExifData::const_iterator pos = prevData.begin(); pos != prevData.end(); ++pos) {
             exifData_.add(*pos);
         }

-- 
exiv2 packaging