[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=d78dec2

The following commit has been merged in the master branch:
commit d78dec24e39b38d03c6b6f8617577d6a64fae65b
Author: sridharb <sridhar_ml at yahoo.com>
Date:   Fri Aug 26 13:35:50 2016 +0000

    Moved ExifDatum::ignore from exif.hpp to the exif.cpp.
    
    This frees up exif.hpp from needing to include tags_int.hpp.
    
    The downside is that this function is no longer inline.
---
 include/exiv2/exif.hpp | 43 +------------------------------------------
 src/exif.cpp           | 44 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp
index 3132273..71a73de 100644
--- a/include/exiv2/exif.hpp
+++ b/include/exiv2/exif.hpp
@@ -35,7 +35,6 @@
 #include "tags.hpp"
 #include "value.hpp"
 #include "types.hpp"
-#include "tags_int.hpp"
 
 // + standard includes
 #include <string>
@@ -249,47 +248,7 @@ namespace Exiv2 {
 
 			@return true if it can be ignored, false otherwise.
 		*/
-		bool ignore(void) const
-		{
-			bool bRet = false;
-
-			const Value &v = value();
-			if (v.count() > 0)
-			{
-				const TagInfo* ti = Internal::tagInfo(tag(), static_cast<Internal::IfdId>(ifdId()));
-				if (ti && ti->hasUndefined_)
-				{
-					const Value &udv = ti->undefValue_;
-					if ((udv.count() != 0))
-					{
-						switch (ti->compT_)
-						{
-							case TagInfo::String:
-							{
-								bRet = compare<std::string>(v.toString(), udv.toString(), ti->compO_);
-								break;
-							}
-							case TagInfo::Long:
-							{
-								bRet = compare<long>(v.toLong(), udv.toLong(), ti->compO_);
-								break;
-							}
-							case TagInfo::Float:
-							{
-								bRet = compare<float>(v.toFloat(), udv.toFloat(), ti->compO_);
-								break;
-							}
-							case TagInfo::Rational:
-							{
-								bRet = compare<Rational>(v.toRational(), udv.toRational(), ti->compO_);
-								break;
-							}
-						}
-					}
-				}
-			}
-			return bRet;
-		}
+		bool ignore(void) const;
         //! Return the size of the data area.
         long sizeDataArea() const;
         /*!
diff --git a/src/exif.cpp b/src/exif.cpp
index d7f5ad0..9c1c2cf 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -417,7 +417,49 @@ namespace Exiv2 {
         return value_.get() == 0 ? Value::AutoPtr(0) : value_->clone();
     }
 
-    long Exifdatum::sizeDataArea() const
+	bool Exifdatum::ignore(void) const
+	{
+		bool bRet = false;
+
+		const Value &v = value();
+		if (v.count() > 0)
+		{
+			const TagInfo* ti = Internal::tagInfo(tag(), static_cast<Internal::IfdId>(ifdId()));
+			if (ti && ti->hasUndefined_)
+			{
+				const Value &udv = ti->undefValue_;
+				if ((udv.count() != 0))
+				{
+					switch (ti->compT_)
+					{
+					case TagInfo::String:
+					{
+						bRet = compare<std::string>(v.toString(), udv.toString(), ti->compO_);
+						break;
+					}
+					case TagInfo::Long:
+					{
+						bRet = compare<long>(v.toLong(), udv.toLong(), ti->compO_);
+						break;
+					}
+					case TagInfo::Float:
+					{
+						bRet = compare<float>(v.toFloat(), udv.toFloat(), ti->compO_);
+						break;
+					}
+					case TagInfo::Rational:
+					{
+						bRet = compare<Rational>(v.toRational(), udv.toRational(), ti->compO_);
+						break;
+					}
+					}
+				}
+			}
+		}
+		return bRet;
+	}
+
+	long Exifdatum::sizeDataArea() const
     {
         return value_.get() == 0 ? 0 : value_->sizeDataArea();
     }

-- 
exiv2 packaging