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

The following commit has been merged in the master branch:
commit 781718035113b761e7baef4e2b543d45363e0c2c
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Mar 21 16:35:06 2015 +0000

    #1042 and #1043.  Don't use a MemIo object for small temporary files.
---
 src/basicio.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index 2ae0e12..d6c7102 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -582,6 +582,9 @@ namespace Exiv2 {
         // If file is > 1MB and doesn't have hard links then use a file, otherwise
         // use a memory buffer. I.e., files with hard links always use a memory
         // buffer, which is a workaround to ensure that the links don't get broken.
+
+        // #1042 and #1043.  Always use a FileIo object to avoid Samba/Ubuntu/cifs error
+        ret = 911;
         if (ret != 0 || (buf.st_size > 1048576 && nlink == 1)) {
             pid_t pid = ::getpid();
             std::auto_ptr<FileIo> fileIo;

-- 
exiv2 packaging