[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=4bf9e16

The following commit has been merged in the master branch:
commit 4bf9e165593d2ab7a5d95cf06a746adecb4ea3f0
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 4 09:20:04 2010 +0000

    Misc tweaks.
---
 src/exiv2.hpp    | 1 -
 src/tags.cpp     | 4 ++--
 src/tags_int.hpp | 3 +++
 src/types.hpp    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/exiv2.hpp b/src/exiv2.hpp
index be161cb..2a428a3 100644
--- a/src/exiv2.hpp
+++ b/src/exiv2.hpp
@@ -40,7 +40,6 @@
 #include "easyaccess.hpp"
 #include "error.hpp"
 #include "exif.hpp"
-#include "exiv2.hpp"
 #include "futils.hpp"
 #include "gifimage.hpp"
 #include "image.hpp"
diff --git a/src/tags.cpp b/src/tags.cpp
index 2e43a31..e577fae 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -2741,9 +2741,9 @@ namespace Exiv2 {
         pos1 = key.find('.', pos0);
         if (pos1 == std::string::npos) throw Error(6, key);
         std::string groupName = key.substr(pos0, pos1 - pos0);
-        if (groupName == "") throw Error(6, key);
+        if (groupName.empty()) throw Error(6, key);
         std::string tn = key.substr(pos1 + 1);
-        if (tn == "") throw Error(6, key);
+        if (tn.empty()) throw Error(6, key);
 
         // Find IfdId
         IfdId ifdId = groupId(groupName);
diff --git a/src/tags_int.hpp b/src/tags_int.hpp
index 37c4c31..6c4d5c8 100644
--- a/src/tags_int.hpp
+++ b/src/tags_int.hpp
@@ -52,6 +52,9 @@ namespace Exiv2 {
 // *****************************************************************************
 // class definitions
 
+    //! Type for a function pointer for functions interpreting the tag value
+    typedef std::ostream& (*PrintFct)(std::ostream&, const Value&, const ExifData* pExifData);
+
     //! Type to specify the IFD to which a metadata belongs
     enum IfdId {
         ifdIdNotSet,
diff --git a/src/types.hpp b/src/types.hpp
index 991784c..6739f90 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -25,7 +25,7 @@
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created<BR>
-           11-Feb-04, ahu: isolated as a component
+           11-Feb-04, ahu: isolated as a component<BR>
            31-Jul-04, brad: added Time, Data and String values
  */
 #ifndef TYPES_HPP_

-- 
exiv2 packaging