[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=8326cae

The following commit has been merged in the master branch:
commit 8326caedf6b045f317ccd2c450cdff700458a3ea
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Aug 9 16:29:01 2006 +0000

    Minor fixes
---
 src/canonmn.hpp | 2 --
 src/tags.hpp    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index 7f29833..43859ca 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -139,8 +139,6 @@ namespace Exiv2 {
         static std::ostream& print0x000c(std::ostream& os, const Value& value);
         //! Self timer
         static std::ostream& printCs10x0002(std::ostream& os, const Value& value);
-        //! Flash details
-        static std::ostream& printCs10x001d(std::ostream& os, const Value& value);
         //! Camera lens information
         static std::ostream& printCs1Lens(std::ostream& os, const Value& value);
         //! ISO speed used
diff --git a/src/tags.hpp b/src/tags.hpp
index 6877774..4846376 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -160,7 +160,7 @@ namespace Exiv2 {
     template <int N, const TagDetailsBitmask (&array)[N]>
     std::ostream& printTagBitmask(std::ostream& os, const Value& value)
     {
-        const uint32_t val = value.toLong();
+        const uint32_t val = static_cast<uint32_t>(value.toLong());
         bool sep = false;
         for (int i = 0; i < N; i++) {
             const TagDetailsBitmask* td = &array[i];

-- 
exiv2 packaging