[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=2b12dfe

The following commit has been merged in the master branch:
commit 2b12dfea4ca2d45ac4c131206ec3040ea4fe3956
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 28 06:17:37 2006 +0000

    Updated Cr2Image to use mmap
---
 src/cr2image.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index d596e3a..3b9efc4 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -158,15 +158,9 @@ namespace Exiv2 {
             throw Error(3, "CR2");
         }
         clearMetadata();
-
-        // Read the image into a memory buffer
-        long len = io_->size();
-        DataBuf buf(len);
-        io_->read(buf.pData_, len);
-        if (io_->error() || io_->eof()) throw Error(14);
-
-        TiffParser::decode(this, buf.pData_, buf.size_, 
+        TiffParser::decode(this, io_->mmap(), io_->size(),
                            TiffCreator::create, Cr2Decoder::findDecoder);
+
     } // Cr2Image::readMetadata
 
     void Cr2Image::writeMetadata()

-- 
exiv2 packaging