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

The following commit has been merged in the master branch:
commit be050525fe27f28a190c3a83c28c5b70d4df8687
Author: Abhinav Badola <mail.abu.to at gmail.com>
Date:   Thu Oct 25 22:16:40 2012 +0000

    Corrected problem of MKV video and RIFF video type, to make video build test successful
---
 src/matroskavideo.cpp | 1 +
 src/riffvideo.cpp     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
index d9cafcb..559aa4f 100644
--- a/src/matroskavideo.cpp
+++ b/src/matroskavideo.cpp
@@ -505,6 +505,7 @@ namespace Exiv2 {
 
         IoCloser closer(*io_);
         clearMetadata();
+        continueTraversing_ = true;
         height_ = width_ = 1;
 
         xmpData_["Xmp.video.FileName"] = io_->path();
diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp
index 87cbe3d..b45a61a 100644
--- a/src/riffvideo.cpp
+++ b/src/riffvideo.cpp
@@ -741,6 +741,7 @@ namespace Exiv2 {
         tempSize = size; char str[9] = " . . . ";
         uint64_t internal_pos, cur_pos; internal_pos = cur_pos = io_->tell();
         const TagDetails* td;
+        double denominator = 1;
         io_->read(buf.pData_, 4); tempSize -= 4;
 
         while(tempSize > 0) {
@@ -798,7 +799,11 @@ namespace Exiv2 {
                     case 0x000f: case 0x001b: case 0x0016:
                         buf2.pData_[0] = buf.pData_[4]; buf2.pData_[1] = buf.pData_[5];
                         buf2.pData_[2] = buf.pData_[6]; buf2.pData_[3] = buf.pData_[7];
-                        xmpData_[exvGettext(td->label_)] = (double)Exiv2::getLong(buf.pData_, littleEndian) / (double)Exiv2::getLong(buf2.pData_, littleEndian);;
+                        denominator = (double)Exiv2::getLong(buf2.pData_, littleEndian);
+                        if (denominator != 0)
+                            xmpData_[exvGettext(td->label_)] = (double)Exiv2::getLong(buf.pData_, littleEndian) / denominator;
+                        else
+                            xmpData_[exvGettext(td->label_)] = 0;
                         break;
 
                     default:

-- 
exiv2 packaging