[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=259a4bb

The following commit has been merged in the master branch:
commit 259a4bb2bf75a4134d9fefd3860cacce7d8c5ae8
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jan 3 15:20:13 2010 +0000

    Optimized TiffMappingInfo::operator==().
---
 src/tiffcomposite.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 8ee15d0..02ec63d 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -45,6 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
 
 // + standard includes
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
@@ -180,8 +181,8 @@ namespace Exiv2 {
 
     bool TiffMappingInfo::operator==(const TiffMappingInfo::Key& key) const
     {
-        std::string make(make_);
-        return    ("*" == make || make == key.m_.substr(0, make.length()))
+        return    (   0 == strcmp("*", make_)
+                   || 0 == strncmp(make_, key.m_.c_str(), strlen(make_)))
                && (Tag::all == extendedTag_ || key.e_ == extendedTag_)
                && key.g_ == group_;
     }

-- 
exiv2 packaging