[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=022e18d

The following commit has been merged in the master branch:
commit 022e18dc6f3eee6b9cec47a99f5b099d0f5d1c59
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Oct 18 06:35:19 2016 +0000

    #1244 Fix crwimage.cpp to read into memory (to make CRW work with RemoteIo).
---
 src/crwimage.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 8059ce7..883948c 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -131,6 +131,16 @@ namespace Exiv2 {
             throw Error(33);
         }
         clearMetadata();
+        // read all metadata into memory
+        // we should put this into clearMetadata(), however it breaks the test suite!
+        try {
+            std::ofstream devnull;
+            printStructure(devnull,kpsRecursive,0);
+        } catch (Exiv2::Error& e) {
+            DataBuf file(io().size());
+            io_->read(file.pData_,file.size_);
+        }
+
         CrwParser::decode(this, io_->mmap(), io_->size());
 
     } // CrwImage::readMetadata

-- 
exiv2 packaging