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

The following commit has been merged in the master branch:
commit e595f1211f9ca4ba3e7da7e6c6bb88cadc9ef5cb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Sep 23 11:54:56 2008 +0000

    Removed special mapping for Olympus makernote thumbnail.
---
 src/tiffimage.cpp       |  2 --
 src/tiffvisitor.cpp     | 19 -------------------
 src/tiffvisitor_int.hpp |  4 ----
 3 files changed, 25 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index e46b737..4ec47c3 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -468,8 +468,6 @@ namespace Exiv2 {
     // TIFF mapping table for special decoding and encoding requirements
     const TiffMappingInfo TiffMapping::tiffMappingInfo_[] = {
         { "*",       Tag::all, Group::ignr,    0, 0 }, // Do not decode tags with group == Group::ignr
-        { "OLYMPUS",   0x0100, Group::olymp1mn,&TiffDecoder::decodeOlympThumb,   &TiffEncoder::encodeOlympThumb     },
-        { "OLYMPUS",   0x0100, Group::olymp2mn,&TiffDecoder::decodeOlympThumb,   &TiffEncoder::encodeOlympThumb     },
         { "*",         0x02bc, Group::ifd0,    &TiffDecoder::decodeXmp,          0 /*done before the tree is traversed*/ },
         { "*",         0x83bb, Group::ifd0,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ },
         { "*",         0x8649, Group::ifd0,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ },
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 90c558c..f0f3458 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -211,20 +211,6 @@ namespace Exiv2 {
         // Nothing to do
     }
 
-    void TiffDecoder::decodeOlympThumb(const TiffEntryBase* object)
-    {
-        const DataValue* v = dynamic_cast<const DataValue*>(object->pValue());
-        if (v != 0) {
-            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_);
-        }
-    }
-
     void TiffDecoder::getObjData(byte const*& pData,
                                  long& size,
                                  uint16_t tag,
@@ -805,11 +791,6 @@ namespace Exiv2 {
 
     } // TiffEncoder::encodeOffsetEntry
 
-    void TiffEncoder::encodeOlympThumb(TiffEntryBase* object, const Exifdatum* datum)
-    {
-        // Todo
-    }
-
     void TiffEncoder::encodeBigEndianEntry(TiffEntryBase* object, const Exifdatum* datum)
     {
         byteOrder_ = bigEndian;
diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp
index c825a66..97ea0fc 100644
--- a/src/tiffvisitor_int.hpp
+++ b/src/tiffvisitor_int.hpp
@@ -261,8 +261,6 @@ namespace Exiv2 {
         void decodeTiffEntry(const TiffEntryBase* object);
         //! Decode a standard TIFF entry
         void decodeStdTiffEntry(const TiffEntryBase* object);
-        //! Decode Olympus Thumbnail from the TIFF makernote into IFD1
-        void decodeOlympThumb(const TiffEntryBase* object);
         //! Decode IPTC data from an IPTCNAA tag or Photoshop ImageResources
         void decodeIptc(const TiffEntryBase* object);
         //! Decode XMP packet from an XMLPacket tag
@@ -407,8 +405,6 @@ namespace Exiv2 {
         void encodeTiffEntryBase(TiffEntryBase* object, const Exifdatum* datum);
         //! Special encoder function for an offset entry.
         void encodeOffsetEntry(TiffEntryBase* object, const Exifdatum* datum);
-        //! Special encoder function to encode an Olympus Thumbnail from the TIFF makernote into IFD1.
-        void encodeOlympThumb(TiffEntryBase* object, const Exifdatum* datum);
 
         //! Special encoder function to encode SubIFD contents to Image group if it contains primary image data
         // Todo void encodeNikonSubIfd(TiffEntryBase* object, const Exifdatum* datum);

-- 
exiv2 packaging