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

The following commit has been merged in the master branch:
commit b68ecc7cb0de744a1e78211ea9bee01b7f2f998b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Apr 4 15:57:08 2010 +0000

    #686: Removed const-qualifier to make things comply with the C++ standard.
---
 src/exif.cpp    | 8 ++++----
 src/preview.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index c48b6ff..ebed871 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -705,8 +705,8 @@ namespace Exiv2 {
         }
 
         // IPTC and XMP are stored elsewhere, not in the Exif APP1 segment.
-        const IptcData emptyIptc;
-        const XmpData  emptyXmp;
+        IptcData emptyIptc;
+        XmpData  emptyXmp;
 
         // Encode and check if the result fits into a JPEG Exif APP1 segment
         MemIo mio1;
@@ -891,8 +891,8 @@ namespace {
         }
 
         Exiv2::MemIo io;
-        const Exiv2::IptcData emptyIptc;
-        const Exiv2::XmpData  emptyXmp;
+        Exiv2::IptcData emptyIptc;
+        Exiv2::XmpData  emptyXmp;
         Exiv2::TiffParser::encode(io, 0, 0, Exiv2::littleEndian, thumb, emptyIptc, emptyXmp);
         return io.read(io.size());
     }
diff --git a/src/preview.cpp b/src/preview.cpp
index 1109f49..7f047c3 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -647,8 +647,8 @@ namespace {
 
         // write new image
         MemIo mio;
-        const IptcData emptyIptc;
-        const XmpData  emptyXmp;
+        IptcData emptyIptc;
+        XmpData  emptyXmp;
         TiffParser::encode(mio, 0, 0, Exiv2::littleEndian, preview, emptyIptc, emptyXmp);
         return DataBuf(mio.mmap(), mio.size());
     }

-- 
exiv2 packaging