[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=36b7c8f

The following commit has been merged in the master branch:
commit 36b7c8f3acdde0c39e6f55325c6d8ea21356f873
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 18 11:03:20 2008 +0000

    Removed obsolete class Cr2Mapping (Vladimir Nadvornik).
---
 src/cr2image.cpp     | 48 +-----------------------------------------------
 src/cr2image_int.hpp | 43 -------------------------------------------
 2 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index f10fdc7..e012220 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -144,7 +144,7 @@ namespace Exiv2 {
                                         pData,
                                         size,
                                         TiffCreator::create,
-                                        Cr2Mapping::findDecoder,
+                                        TiffMapping::findDecoder,
                                         &cr2Header);
     }
 
@@ -204,52 +204,6 @@ namespace Exiv2 {
 namespace Exiv2 {
     namespace Internal {
 
-    // CR2 mapping table for special CR2 decoding requirements
-    const TiffMappingInfo Cr2Mapping::cr2MappingInfo_[] = {
-        { "*",       Tag::all, Group::ignr,    0, 0 }, // Do not decode tags with group == Group::ignr
-        { "*",         0x014a, Group::ifd0,    0, 0 }, // Todo: Controversial, causes problems with Exiftool
-        { "*",         0x0100, Group::ifd0,    0, 0 }, // CR2 IFD0 refers to a preview image, ignore these tags
-        { "*",         0x0101, Group::ifd0,    0, 0 },
-        { "*",         0x0102, Group::ifd0,    0, 0 },
-        { "*",         0x0103, Group::ifd0,    0, 0 },
-        { "*",         0x0111, Group::ifd0,    0, 0 },
-        { "*",         0x0117, Group::ifd0,    0, 0 },
-        { "*",         0x011a, Group::ifd0,    0, 0 },
-        { "*",         0x011b, Group::ifd0,    0, 0 },
-        { "*",         0x0128, Group::ifd0,    0, 0 },
-        { "*",         0x02bc, Group::ifd0,    &TiffDecoder::decodeXmp,    0 /*Todo*/ },
-        { "*",         0x83bb, Group::ifd0,    &TiffDecoder::decodeIptc,   0 /*Todo*/ },
-        { "*",         0x8649, Group::ifd0,    &TiffDecoder::decodeIptc,   0 /*Todo*/ }
-    };
-
-    DecoderFct Cr2Mapping::findDecoder(const std::string& make,
-                                             uint32_t     extendedTag,
-                                             uint16_t     group)
-    {
-        DecoderFct decoderFct = &TiffDecoder::decodeStdTiffEntry;
-        const TiffMappingInfo* td = find(cr2MappingInfo_,
-                                         TiffMappingInfo::Key(make, extendedTag, group));
-        if (td) {
-            // This may set decoderFct to 0, meaning that the tag should not be decoded
-            decoderFct = td->decoderFct_;
-        }
-        return decoderFct;
-    }
-
-    EncoderFct Cr2Mapping::findEncoder(const std::string& make,
-                                             uint32_t     extendedTag,
-                                             uint16_t     group)
-    {
-        EncoderFct encoderFct = 0;
-        const TiffMappingInfo* td = find(cr2MappingInfo_,
-                                         TiffMappingInfo::Key(make, extendedTag, group));
-        if (td) {
-            // Returns 0 if no special encoder function is found
-            encoderFct = td->encoderFct_;
-        }
-        return encoderFct;
-    }
-
     const char* Cr2Header::cr2sig_ = "CR

-- 
exiv2 packaging