[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=8b66d3e

The following commit has been merged in the master branch:
commit 8b66d3e7db3943dfae1e19ea21944a68b5d42dbf
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 25 15:48:29 2010 +0000

    Tweaks.
---
 src/tags.cpp | 19 +++++++++----------
 src/tags.hpp |  2 --
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 8c0bf26..7fcc444 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -2801,7 +2801,8 @@ namespace Exiv2 {
         key_ = std::string(familyName_) + "." + groupName_ + "." + tagName();
     }
 
-    void ExifKey::create_internal(uint16_t tag, const std::string& groupName)
+    ExifKey::ExifKey(uint16_t tag, const std::string& groupName)
+        : p_(new Impl)
     {
         IfdId ifdId = groupId(groupName);
         // Todo: Test if this condition can be removed
@@ -2816,16 +2817,15 @@ namespace Exiv2 {
         p_->makeKey(tag, ifdId, ti);
     }
 
-    ExifKey::ExifKey(uint16_t tag, const std::string& groupName)
-        : p_(new Impl)
-    {
-        create_internal(tag, groupName);
-    }
-
     ExifKey::ExifKey(const TagInfo& ti)
         : p_(new Impl)
     {
-        create_internal(ti.tag_, Internal::groupName(static_cast<Internal::IfdId>(ti.ifdId_)));
+        IfdId ifdId = static_cast<IfdId>(ti.ifdId_);
+        if (!Internal::isExifIfd(ifdId) && !Internal::isMakerIfd(ifdId)) {
+            throw Error(23, ifdId);
+        }
+        p_->groupName_ = Exiv2::groupName(ifdId);
+        p_->makeKey(ti.tag_, ifdId, &ti);
     }
 
     ExifKey::ExifKey(const std::string& key)
@@ -2925,8 +2925,7 @@ namespace Exiv2 {
 
     std::ostream& operator<<(std::ostream& os, const TagInfo& ti)
     {
-        
-        ExifKey exifKey(ti.tag_, Internal::groupName(static_cast<Internal::IfdId>(ti.ifdId_)));
+        ExifKey exifKey(ti);
         return os << exifKey.tagName() << ",	"
                   << std::dec << exifKey.tag() << ",	"
                   << "0x" << std::setw(4) << std::setfill('0')
diff --git a/src/tags.hpp b/src/tags.hpp
index f39937d..cf1f342 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -219,8 +219,6 @@ namespace Exiv2 {
     private:
         //! Internal virtual copy constructor.
         EXV_DLLLOCAL virtual ExifKey* clone_() const;
-        //! Internal construction method.
-        void create_internal(uint16_t tag, const std::string& groupName);
 
     private:
         // Pimpl idiom

-- 
exiv2 packaging