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

The following commit has been merged in the master branch:
commit f03af22ccdab7d7e0b4e52b7d9cc8daaa12f2ce4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Feb 17 13:42:15 2010 +0000

    #683: Fixed -r conversions for weekday and day of year.
---
 src/actions.cpp             |   4 ++++
 test/bugfixes-test.sh       |   6 ++++++
 test/data/bugfixes-test.out | Bin 69923 -> 70017 bytes
 3 files changed, 10 insertions(+)

diff --git a/src/actions.cpp b/src/actions.cpp
index 72a0b78..8a95c21 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1848,6 +1848,10 @@ namespace {
         if (!Util::strtol(timeStr.substr(17,2).c_str(), tmp)) return 10;
         tm->tm_sec = tmp;
 
+        // Conversions to set remaining fields of the tm structure
+        time_t time = timegm(tm);
+        if (time == (time_t)-1 || gmtime_r(&time, tm) == 0) return 11;
+
         return 0;
     } // str2Tm
 
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 4d76558..aadd3ac 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -142,6 +142,12 @@ $exiv2 -v -M'set Exif.Image.Make NIKON' \
 
 $exiv2 -pa -u -b $filename
 
+num=683
+filename=exiv2-bug$num.jpg
+cp -f ../data/exiv2-nikon-d70.jpg $filename
+echo '------>' Bug $num '<-------' >&2
+$exiv2 -v -f -r %Y-%m-%d-%a-%j $filename
+
 ) > $results 2>&1
 
 # ----------------------------------------------------------------------
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index bd0d37b..2dc0a54 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging