[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=00aaa2a

The following commit has been merged in the master branch:
commit 00aaa2aee449b764b235c80618f0e8ee3f492d88
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 15 14:07:01 2006 +0000

    Made ExifTags::tagTitle not inlined, based on strange link error reported
---
 src/tags.cpp | 5 +++++
 src/tags.hpp | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index bcf7146..3b1e3a2 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -408,6 +408,11 @@ namespace Exiv2 {
         return os.str();
     } // ExifTags::tagName
 
+    const char* ExifTags::tagTitle(uint16_t tag, IfdId ifdId)
+    {
+        return tagLabel(tag, ifdId); 
+    } // ExifTags::tagTitle
+
     const char* ExifTags::tagLabel(uint16_t tag, IfdId ifdId)
     {
         if (isExifIfd(ifdId)) {
diff --git a/src/tags.hpp b/src/tags.hpp
index 14200c8..6ffd97d 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -194,8 +194,7 @@ namespace Exiv2 {
           @param ifdId IFD id
           @return The title (label) of the tag.
          */
-        static const char* tagTitle(uint16_t tag, IfdId ifdId)
-            { return tagLabel(tag, ifdId); }
+        static const char* tagTitle(uint16_t tag, IfdId ifdId);
         /*!
           @brief Return the title (label) of the tag.
 

-- 
exiv2 packaging