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

The following commit has been merged in the master branch:
commit 6b89dc9452040b3a1cb5cf5ce3c8bdf94bf97643
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Mar 21 22:33:21 2015 +0000

    #1038.  Initialize timeScale_ in ctor because MSVC (correctly) refused header member variable initialization.
---
 include/exiv2/quicktimevideo.hpp | 2 +-
 src/quicktimevideo.cpp           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp
index 3050aaf..9a8b1d4 100644
--- a/include/exiv2/quicktimevideo.hpp
+++ b/include/exiv2/quicktimevideo.hpp
@@ -223,7 +223,7 @@ namespace Exiv2 {
 
     private:
         //! Variable which stores Time Scale unit, used to calculate time.
-        uint64_t timeScale_ = 1;
+        uint64_t timeScale_;
         //! Variable which stores current stream being processsed.
         int currentStream_;
         //! Variable to check the end of metadata traversing.
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index e7ca8c2..be27da5 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -610,6 +610,7 @@ namespace Exiv2 {
 
     QuickTimeVideo::QuickTimeVideo(BasicIo::AutoPtr io)
             : Image(ImageType::qtime, mdNone, io)
+            , timeScale_(1)
     {
     } // QuickTimeVideo::QuickTimeVideo
 

-- 
exiv2 packaging