[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=8afd3f4

The following commit has been merged in the master branch:
commit 8afd3f43aa20e4a8adfedafe7497e928996136f3
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Jul 25 00:38:11 2016 +0000

    #1198.  Fixed issue with http I/O failing a test file.
---
 src/basicio.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index f22ce34..3d1c7c5 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -1890,9 +1890,11 @@ namespace Exiv2 {
             case BasicIo::end: newIdx = p_->size_ + offset; break;
         }
 
-        if (newIdx < 0 || newIdx > (long) p_->size_) return 1;
+        // #1198.  Don't return 1 when asked to seek past EOF.  Stay calm and set eof_
+        // if (newIdx < 0 || newIdx > (long) p_->size_) return 1;
         p_->idx_ = newIdx;
-        p_->eof_ = false;
+        p_->eof_ = newIdx > (long) p_->size_;
+        if ( p_->idx_ > (long) p_->size_ ) p_->idx_= (long) p_->size_;
         return 0;
     }
 #endif

-- 
exiv2 packaging