[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:39:38 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=51a2a03

The following commit has been merged in the master branch:
commit 51a2a03f225a7366292cce1d9328b6687adbde1b
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Sun Jul 27 20:18:49 2008 +0000

    another problem with this unlogic DataBuf::alloc() rule. Now XMP data can be extracted and parsed properlly.
---
 src/pngimage.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 45ab2d4..40149ab 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -85,7 +85,6 @@ namespace Exiv2
         clearMetadata();
 
         DataBuf cheaderBuf(8);       // Chunk header size : 4 bytes (data size) + 4 bytes (chunk type).
-        DataBuf cdataBuf;            // Chunk data size (not fixed size - can be null).
 
         while(!io_->eof())
         {
@@ -117,7 +116,7 @@ namespace Exiv2
             {
                 // Extract chunk data. 
 
-                cdataBuf.alloc(dataOffset);
+                DataBuf cdataBuf(dataOffset);
                 bufRead = io_->read(cdataBuf.pData_, dataOffset);
                 if (io_->error()) throw Error(14);
                 if (bufRead != (long)dataOffset) throw Error(20);

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list