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

The following commit has been merged in the master branch:
commit d84c70192a1106a83ccfc915b044adcc2cc5c941
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Feb 25 08:15:42 2012 +0000

    #808: Applied patch by Pavel Heimlich.
---
 src/jpgimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 6be5004..66cd87b 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -804,7 +804,7 @@ namespace Exiv2 {
             }
             else if (   skipApp1Exif == count
                      || skipApp1Xmp  == count
-                     || find(skipApp13Ps3.begin(), skipApp13Ps3.end(), count) != skipApp13Ps3.end()
+                     || std::find(skipApp13Ps3.begin(), skipApp13Ps3.end(), count) != skipApp13Ps3.end()
                      || skipCom      == count) {
                 --search;
                 io_->seek(size-bufRead, BasicIo::cur);

-- 
exiv2 packaging