[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=345cc8f

The following commit has been merged in the master branch:
commit 345cc8fa4323b68b69b43fbe26fd06de0767c684
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 20 03:12:12 2006 +0000

    Fixed MinGW/older g++ compilation problem
---
 src/tiffvisitor.cpp | 6 +++---
 src/tiffvisitor.hpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 732189d..c21a79f 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -56,9 +56,9 @@ namespace Exiv2 {
     // TIFF Decoder table for special decoding requirements
     const TiffDecoderInfo TiffMetadataDecoder::tiffDecoderInfo_[] = {
         { "*",       Tag::all, Group::ignr,    0 }, // Do not decode tags with group == Group::ignr
-        { "OLYMPUS",   0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb      },
-        { "NIKON",   Tag::all, Group::sub0_0,  0                                           },
-        { "NIKON",   Tag::all, Group::sub0_1,  &TiffMetadataDecoder::decodeTo<Group::ifd0> }
+        { "OLYMPUS",   0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb },
+        { "NIKON",   Tag::all, Group::sub0_0,  0 },
+        { "NIKON",   Tag::all, Group::sub0_1,  &TiffMetadataDecoder::decodeToGroup<Group::ifd0> }
     };
 
     bool TiffDecoderInfo::operator==(const TiffDecoderInfo::Key& key) const
diff --git a/src/tiffvisitor.hpp b/src/tiffvisitor.hpp
index 2766cf0..d984630 100644
--- a/src/tiffvisitor.hpp
+++ b/src/tiffvisitor.hpp
@@ -281,10 +281,10 @@ namespace Exiv2 {
         void decodeOlympThumb(const TiffEntryBase* object);
         //! Decode object to the Exif entry tag, group given as template parameters
         template<uint16_t tag, uint16_t group>
-        void decodeTo(const TiffEntryBase* object);
+        void decodeToTag(const TiffEntryBase* object);
         //! Decode object to the Exif entry with group according to the template parameter
         template<uint16_t group>
-        void decodeTo(const TiffEntryBase* object);
+        void decodeToGroup(const TiffEntryBase* object);
         //@}
 
     private:
@@ -506,7 +506,7 @@ namespace Exiv2 {
 // template, inline and free functions
 
     template<uint16_t tag, uint16_t group>
-    void TiffMetadataDecoder::decodeTo(const TiffEntryBase* object)
+    void TiffMetadataDecoder::decodeToTag(const TiffEntryBase* object)
     {
         assert(object);
         // Todo: ExifKey should have an appropriate c'tor, it should not be 
@@ -516,7 +516,7 @@ namespace Exiv2 {
     }
 
     template<uint16_t group>
-    void TiffMetadataDecoder::decodeTo(const TiffEntryBase* object)
+    void TiffMetadataDecoder::decodeToGroup(const TiffEntryBase* object)
     {
         assert(object);
         // Todo: ExifKey should have an appropriate c'tor, it should not be 

-- 
exiv2 packaging