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

The following commit has been merged in the master branch:
commit b945568e6e823f793db223f0b436d9a26d4e5156
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Feb 3 14:36:32 2006 +0000

    Fixed MSVC compilation errors
---
 src/basicio.hpp | 1 +
 src/image.cpp   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/basicio.hpp b/src/basicio.hpp
index 6476594..4f5b5b1 100644
--- a/src/basicio.hpp
+++ b/src/basicio.hpp
@@ -35,6 +35,7 @@
 
 // + standard includes
 #include <string>
+#include <memory>
 #include <cstdio>
 
 // *****************************************************************************
diff --git a/src/image.cpp b/src/image.cpp
index 867ed27..995d3e7 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -64,7 +64,7 @@ namespace Exiv2 {
 
     bool Image::supportsMetadata(MetadataId metadataId) const
     {
-        return supportedMetadata_ & metadataId;
+        return (supportedMetadata_ & metadataId) != 0;
     }
 
     const ImageFactory::Registry* ImageFactory::find(int imageType)

-- 
exiv2 packaging