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

The following commit has been merged in the master branch:
commit ea35e19f51a30f882ccd43beb253a4634cb8fa42
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Apr 23 15:20:28 2006 +0000

    Quick and temporary hack to decode the thumbnail from the makernote of Olympus TIFF files. A mechanism to cleanly extend the decoder with code like this will be required.
---
 src/tiffvisitor.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index a95a4e7..2648ed0 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -158,6 +158,25 @@ namespace Exiv2 {
 
         if (object->group() == Group::ignr) return;
 
+        // Experimental code to decode Olympus Thumbnail from the TIFF makernote
+        // into IFD1.  
+        // Todo: this should go elsewhere. Ideally, such code to decode specific
+        // tag/group combinations could be added from outside
+        if (object->tag() == 0x0100 && object->group() == 257) {
+            const DataValue* v = dynamic_cast<const DataValue*>(object->pValue());
+            if (v != 0) {
+                ExifData& exifData = pImage_->exifData();
+                exifData["Exif.Thumbnail.Compression"] = uint16_t(6);
+                DataBuf buf(v->size());
+                v->copy(buf.pData_);
+                Exifdatum& ed = exifData["Exif.Thumbnail.JPEGInterchangeFormat"];
+                ed = uint32_t(0);
+                ed.setDataArea(buf.pData_, buf.size_);
+                exifData["Exif.Thumbnail.JPEGInterchangeFormatLength"] = uint32_t(buf.size_);
+                return;
+            }
+        }
+
         // Todo: ExifKey should have an appropriate c'tor, it should not be 
         //       necessary to use groupName here
         ExifKey k(object->tag(), object->groupName());

-- 
exiv2 packaging