[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=81ff0d6

The following commit has been merged in the master branch:
commit 81ff0d6a7c38ba7f3ba38369aa19a20939ad42d9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Apr 4 15:50:11 2008 +0000

    Fixed g++-4.3 errors and warnings.
---
 config/config.mk.in         | 2 +-
 src/actions.cpp             | 8 ++++----
 src/cr2image.cpp            | 6 +++---
 src/cr2image.hpp            | 6 +++---
 src/exif.cpp                | 2 +-
 src/sigmamn.cpp             | 6 +++---
 src/tags.cpp                | 8 ++++----
 src/tifffwd.hpp             | 6 +++---
 src/tiffparser.cpp          | 6 +++---
 src/tiffparser.hpp          | 6 +++---
 xmpsdk/src/XMPCore_Impl.hpp | 1 +
 11 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/config/config.mk.in b/config/config.mk.in
index 9aba410..d615617 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -58,7 +58,7 @@ GXX = @GXX@
 # Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
 CXXFLAGS = @CXXFLAGS@
 ifeq ($(GXX),yes)
-	CXXFLAGS += -Wall -Wcast-align -Wconversion -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W
+	CXXFLAGS += -Wall -Wcast-align -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W
 endif
 
 # Command to run only the preprocessor
diff --git a/src/actions.cpp b/src/actions.cpp
index 6916e43..46ef427 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1125,10 +1125,10 @@ namespace Action {
             rc = insertThumbnail(path);
         }
         if (   rc == 0
-            && Params::instance().target_ & Params::ctExif
-            || Params::instance().target_ & Params::ctIptc
-            || Params::instance().target_ & Params::ctComment
-            || Params::instance().target_ & Params::ctXmp) {
+            && (   Params::instance().target_ & Params::ctExif
+                || Params::instance().target_ & Params::ctIptc
+                || Params::instance().target_ & Params::ctComment
+                || Params::instance().target_ & Params::ctXmp)) {
             std::string suffix = Params::instance().suffix_;
             if (suffix.empty()) suffix = ".exv";
             std::string exvPath = newFilePath(path, suffix);
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 45fce43..2189fcd 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -74,9 +74,9 @@ namespace Exiv2 {
         { "*",         0x8649, Group::ifd0,    &TiffMetadataDecoder::decodeIptc }
     };
 
-    const DecoderFct Cr2Decoder::findDecoder(const std::string& make,
-                                                   uint32_t     extendedTag,
-                                                   uint16_t     group)
+    DecoderFct Cr2Decoder::findDecoder(const std::string& make,
+                                             uint32_t     extendedTag,
+                                             uint16_t     group)
     {
         DecoderFct decoderFct = &TiffMetadataDecoder::decodeStdTiffEntry;
         const TiffDecoderInfo* td = find(cr2DecoderInfo_,
diff --git a/src/cr2image.hpp b/src/cr2image.hpp
index f00ad6a..9492d27 100644
--- a/src/cr2image.hpp
+++ b/src/cr2image.hpp
@@ -137,9 +137,9 @@ namespace Exiv2 {
 
           @return Pointer to the decoder function
          */
-        static const DecoderFct findDecoder(const std::string& make,
-                                                  uint32_t     extendedTag,
-                                                  uint16_t     group);
+        static DecoderFct findDecoder(const std::string& make,
+                                            uint32_t     extendedTag,
+                                            uint16_t     group);
 
     private:
         static const TiffDecoderInfo cr2DecoderInfo_[]; //<! CR2 decoder table
diff --git a/src/exif.cpp b/src/exif.cpp
index 121a24d..00332bf 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -959,7 +959,7 @@ namespace Exiv2 {
                                                 + pGpsIfd_->dataSize());
             }
             if (   maxOffset > pIfd1_->offset()
-                || maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0)
+                || (maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0))
                 rc = false;
             /*
                Todo: Removed condition from the above if(). Should be re-added...
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index 257b654..b619cf1 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -178,10 +178,10 @@ namespace Exiv2 {
         int rc = 0;
         // Check the SIGMA or FOVEON prefix
         if (   header_.size_ < 10
-            || std::string(reinterpret_cast<char*>(header_.pData_), 8)
+            || (   std::string(reinterpret_cast<char*>(header_.pData_), 8)
                         != std::string("SIGMA

-- 
exiv2 packaging