[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=6ca49ac

The following commit has been merged in the master branch:
commit 6ca49acd13bdf357ea4299ae0a747eca47868cc5
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 18 07:17:59 2012 +0000

    Work on Issue 846 (porting video code to MSVC).  See http://dev.exiv2.org/issues/846 (item #8) for more discussion.
---
 src/asfvideo.cpp       | 20 +++++++++---------
 src/basicio.cpp        | 35 ++++++++++++++++++++++++++++++++
 src/basicio.hpp        | 35 ++++++++++++++++++++++++++++++++
 src/jp2image.cpp       |  2 +-
 src/matroskavideo.cpp  | 19 ++++++++---------
 src/quicktimevideo.cpp | 55 +++++++++++++++++++++++++++++---------------------
 src/riffvideo.cpp      | 18 ++++++++---------
 7 files changed, 132 insertions(+), 52 deletions(-)

diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index 5cd6f81..197d8b4 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -281,9 +281,9 @@ namespace Exiv2 {
     uint64_t getUint64_t(Exiv2::DataBuf& buf) {
         uint64_t temp = 0;
 
-        for(int i = 0; i < 8; ++i)
-            temp = temp + buf.pData_[i]*(pow(256,i));
-
+		for(int i = 0; i < 8; ++i){
+			temp = temp + static_cast<uint64_t>(buf.pData_[i]*(pow(static_cast<float>(256), i)));
+		}
         return temp;
     }
 
@@ -334,7 +334,7 @@ namespace Exiv2 {
 
     void AsfVideo::decodeBlock()
     {
-        const long bufMinSize = 8;
+        const long bufMinSize = 9;
         DataBuf buf(bufMinSize);
         unsigned long size = 0;
         buf.pData_[8] = '

-- 
exiv2 packaging