[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:37:11 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7d3f50c

The following commit has been merged in the master branch:
commit 7d3f50c24479d29f5d9119b6201c1007d6dd9d2e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Jul 8 15:50:52 2005 +0000

    Minor changes (moved inline functions which throw to *.cpp files)
---
 src/exif.cpp | 6 ++++++
 src/exif.hpp | 3 +--
 src/iptc.cpp | 6 ++++++
 src/iptc.hpp | 3 +--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 7b90740..4090359 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -114,6 +114,12 @@ namespace Exiv2 {
         if (rhs.value_.get() != 0) value_ = rhs.value_->clone(); // deep copy
     }
 
+    const Value& Exifdatum::value() const 
+    {
+        if (value_.get() == 0) throw Error(8);        
+        return *value_; 
+    }
+
     Exifdatum& Exifdatum::operator=(const Exifdatum& rhs)
     {
         if (this == &rhs) return *this;
diff --git a/src/exif.hpp b/src/exif.hpp
index aab04a6..21a5bb7 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -283,8 +283,7 @@ namespace Exiv2 {
           @return A constant reference to the value.
           @throw Error if the value is not set.
          */
-        const Value& value() const 
-            { if (value_.get() != 0) return *value_; throw Error(8); }
+        const Value& value() const; 
         //! Return the size of the data area.
         long sizeDataArea() const 
             { return value_.get() == 0 ? 0 : value_->sizeDataArea(); }
diff --git a/src/iptc.cpp b/src/iptc.cpp
index 25dca16..7b16eec 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -66,6 +66,12 @@ namespace Exiv2 {
     {
     }
 
+    const Value& Iptcdatum::value() const
+    {
+        if (value_.get() == 0) throw Error(8);
+        return *value_; 
+    }
+
     Iptcdatum& Iptcdatum::operator=(const Iptcdatum& rhs)
     {
         if (this == &rhs) return *this;
diff --git a/src/iptc.hpp b/src/iptc.hpp
index 1bbf678..5300051 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -226,8 +226,7 @@ namespace Exiv2 {
           @return A constant reference to the value.
           @throw Error If the value is not set.
          */
-        const Value& value() const
-            { if (value_.get() != 0) return *value_; throw Error(8); }
+        const Value& value() const;
         //@}
 
     private:

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list