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

The following commit has been merged in the master branch:
commit ed6f195c7f55bf2b01677c31e9f2bcf09608b7fb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jan 30 09:50:03 2010 +0000

    #677: Changed the container for Exif metadata from a std::vector to a std::list (plus an unrelated optimization).
---
 src/exif.cpp          | 4 ++--
 src/exif.hpp          | 4 ++--
 src/tiffcomposite.cpp | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index bf5de5a..e3d6f16 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -601,12 +601,12 @@ namespace Exiv2 {
 
     void ExifData::sortByKey()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByKey);
+        exifMetadata_.sort(cmpMetadataByKey);
     }
 
     void ExifData::sortByTag()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByTag);
+        exifMetadata_.sort(cmpMetadataByTag);
     }
 
     ExifData::iterator ExifData::erase(ExifData::iterator beg, ExifData::iterator end)
diff --git a/src/exif.hpp b/src/exif.hpp
index 3db2290..e4637d3 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -38,7 +38,7 @@
 
 // + standard includes
 #include <string>
-#include <vector>
+#include <list>
 #include <memory>
 
 // *****************************************************************************
@@ -423,7 +423,7 @@ namespace Exiv2 {
     }; // class ExifThumb
 
     //! Container type to hold all metadata
-    typedef std::vector<Exifdatum> ExifMetadata;
+    typedef std::list<Exifdatum> ExifMetadata;
 
     /*!
       @brief A container for Exif data.  This is a top-level class of the %Exiv2
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 02ec63d..2fa2b31 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -161,8 +161,7 @@ namespace Exiv2 {
 
     bool TiffGroupInfo::operator==(const std::string& groupName) const
     {
-        std::string name(name_);
-        return name == groupName;
+        return 0 == strcmp(name_, groupName.c_str());
     }
 
     const char* tiffGroupName(uint16_t group)

-- 
exiv2 packaging