[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=b960062

The following commit has been merged in the master branch:
commit b960062f905aebaace0675c4e6c7db0d92c0ef30
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 28 05:44:42 2011 +0000

    EPS: fixed a cast and removed a useless comment.
---
 src/iptc.cpp  | 2 +-
 src/types.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/iptc.cpp b/src/iptc.cpp
index 99b019f..22dc234 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -506,7 +506,7 @@ namespace Exiv2 {
                 uint16_t sizeOfSize = 4 | 0x8000;
                 us2Data(pWrite, sizeOfSize, bigEndian);
                 pWrite += 2;
-                ul2Data(pWrite, dataSize, bigEndian);
+                ul2Data(pWrite, (uint32_t) dataSize, bigEndian);
                 pWrite += 4;
             }
             else {
diff --git a/src/types.cpp b/src/types.cpp
index 8055ad4..10dd3ba 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -351,7 +351,7 @@ namespace Exiv2 {
     long ul2Data(byte* buf, size_t s, ByteOrder byteOrder)
     {
         uint32_t l = (uint32_t) s;
-        return ul2Data(buf,l,byteOrder); // TODO: should this be sizeof(size_t) ?
+        return ul2Data(buf,l,byteOrder);
     }
 #endif
 

-- 
exiv2 packaging