[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=5b21ded

The following commit has been merged in the master branch:
commit 5b21deda9324439908043e4a08966c8f4e5dd5b5
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 28 18:02:12 2016 +0000

    #1234 Corrections to r4577
---
 src/pgfimage.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp
index 0d04cd3..358ab58 100644
--- a/src/pgfimage.cpp
+++ b/src/pgfimage.cpp
@@ -107,11 +107,12 @@ namespace Exiv2 {
     {
         uint32_t v;
         char*    p = (char*) &v;
-        p[0] = buf.pData_[offset];
-        p[1] = buf.pData_[offset+1];
-        p[2] = buf.pData_[offset+2];
-        p[3] = buf.pData_[offset+3];
-        return byteSwap(v,bSwap);
+        int      i;
+        for ( i = 0 ; i < 4 ; i++ ) p[i] = buf.pData_[offset+i];
+        uint32_t result = byteSwap(v,bSwap);
+        p               = (char*) &result;
+        for ( i = 0 ; i < 4 ; i++ ) buf.pData_[offset+i] = p[i];
+        return result;
     }
 
     PgfImage::PgfImage(BasicIo::AutoPtr io, bool create)
@@ -323,7 +324,7 @@ namespace Exiv2 {
         DataBuf work(8);  // don't disturb the binary data - doWriteMetadata reuses it
         memcpy (work.pData_,header.pData_,8);
         width   = byteSwap(work,0,bSwap_);
-        height  = byteSwap(header,4,bSwap_);
+        height  = byteSwap(work,4,bSwap_);
 
         /* NOTE: properties not yet used
         byte nLevels  = buffer.pData_[8];

-- 
exiv2 packaging