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

The following commit has been merged in the master branch:
commit f2986148b55c8052f3ed6499fb21481377e1cfdd
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jul 13 20:09:35 2014 +0000

    CID: 982053/4.  Restore os format
---
 src/value.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index dcab406..eb0bac8 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -1005,9 +1005,12 @@ namespace Exiv2 {
 
     std::ostream& DateValue::write(std::ostream& os) const
     {
-        return os << date_.year << '-' << std::right
-               << std::setw(2) << std::setfill('0') << date_.month << '-'
-               << std::setw(2) << std::setfill('0') << date_.day;
+        std::ios::fmtflags f( os.flags() );
+        os << date_.year << '-' << std::right
+           << std::setw(2) << std::setfill('0') << date_.month << '-'
+           << std::setw(2) << std::setfill('0') << date_.day;
+    	os.flags(f);
+    	return os;
     }
 
     long DateValue::toLong(long /*n*/) const
@@ -1183,12 +1186,16 @@ namespace Exiv2 {
         char plusMinus = '+';
         if (time_.tzHour < 0 || time_.tzMinute < 0) plusMinus = '-';
 
-        return os << std::right
+        std::ios::fmtflags f( os.flags() );
+        os << std::right
            << std::setw(2) << std::setfill('0') << time_.hour << ':'
            << std::setw(2) << std::setfill('0') << time_.minute << ':'
            << std::setw(2) << std::setfill('0') << time_.second << plusMinus
            << std::setw(2) << std::setfill('0') << abs(time_.tzHour) << ':'
            << std::setw(2) << std::setfill('0') << abs(time_.tzMinute);
+        os.flags(f);
+
+        return os;
     }
 
     long TimeValue::toLong(long /*n*/) const

-- 
exiv2 packaging