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

The following commit has been merged in the master branch:
commit de403e5933305bbb40eb585f0382ae8f7f87c30b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jun 23 11:35:44 2008 +0000

    Reinstated sortByKey and sortByTag.
---
 src/exif.cpp | 7 ++++++-
 src/exif.hpp | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index dea82b3..c0dea5a 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -400,7 +400,12 @@ namespace Exiv2 {
 
     void ExifData::sortByKey()
     {
-        // TODO
+        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByKey);
+    }
+
+    void ExifData::sortByTag()
+    {
+        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByTag);
     }
 
     ExifData::iterator ExifData::erase(ExifData::iterator pos)
diff --git a/src/exif.hpp b/src/exif.hpp
index 9f71c93..475072d 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -469,6 +469,8 @@ namespace Exiv2 {
         void clear();
         //! Sort metadata by key
         void sortByKey();
+        //! Sort metadata by tag
+        void sortByTag();
         //! Begin of the metadata
         iterator begin() { return exifMetadata_.begin(); }
         //! End of the metadata

-- 
exiv2 packaging