[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=51caa6a

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

    More minor changes.
---
 src/convert.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index 4dc6d13..f4f7cd6 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -962,7 +962,7 @@ namespace Exiv2 {
         if (pos == xmpData_->end()) return;
         if (!prepareIptcTarget(to)) return;
         int count = pos->value().count();
-        for (int i = 0; i < count; i++) {
+        for (int i = 0; i < count; ++i) {
             std::string value = pos->value().toString();
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
@@ -1070,8 +1070,7 @@ namespace Exiv2 {
         MD5Update(&context, data.pData_, data.size_);
         MD5Final(digest, &context);
         res << std::setw(2) << std::setfill('0') << std::hex << std::uppercase;
-        int i;
-        for (i = 0; i < 16; i++) {
+        for (int i = 0; i < 16; ++i) {
             res << static_cast<int>(digest[i]);
         }
         return res.str();

-- 
exiv2 packaging