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

The following commit has been merged in the master branch:
commit f5bf128c1523472effe69386feeecca0b989db63
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue May 20 04:08:30 2008 +0000

    Fixed g++-4.3 warnings.
---
 src/convert.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index 3ed0d48..b76b7b9 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -388,8 +388,8 @@ namespace Exiv2 {
     {
         for (unsigned int i = 0; i < EXV_COUNTOF(conversion_); ++i) {
             const Conversion& c = conversion_[i];
-            if (c.metadataId == mdExif && exifData_ ||
-	        c.metadataId == mdIptc && iptcData_) {
+            if (   (c.metadataId == mdExif && exifData_)
+                || (c.metadataId == mdIptc && iptcData_)) {
                 EXV_CALL_MEMBER_FN(*this, c.key1ToKey2)(c.key1, c.key2);
             }
         }
@@ -399,8 +399,8 @@ namespace Exiv2 {
     {
         for (unsigned int i = 0; i < EXV_COUNTOF(conversion_); ++i) {
             const Conversion& c = conversion_[i];
-            if (c.metadataId == mdExif && exifData_ ||
-	        c.metadataId == mdIptc && iptcData_) {
+            if (   (c.metadataId == mdExif && exifData_)
+                || (c.metadataId == mdIptc && iptcData_)) {
                 EXV_CALL_MEMBER_FN(*this, c.key2ToKey1)(c.key2, c.key1);
             }
         }

-- 
exiv2 packaging