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

The following commit has been merged in the master branch:
commit d53a778b2b4b3c1e428b7c49522f44da29d8f46e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jul 22 17:55:40 2006 +0000

    Fixed MSVC 2005 issues (except for exiv2com) and minor problems. All tests pass now on MSVC 2005. Fixes bug #455
---
 src/actions.cpp             | 8 ++++----
 src/jpgimage.cpp            | 2 +-
 src/timegm.h                | 5 +++++
 test/bugfixes-test.sh       | 2 +-
 test/data/bugfixes-test.out | 6 +++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 3a587f6..7210e1e 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -37,19 +37,19 @@ EXIV2_RCSID("@(#) $Id$")
 # include "exv_conf.h"
 #endif
 
+#ifndef EXV_HAVE_TIMEGM
+# include "timegm.h"
+#endif
 #include "actions.hpp"
+#include "exiv2.hpp"
 #include "image.hpp"
 #include "jpgimage.hpp"
-#include "exiv2.hpp"
 #include "utils.hpp"
 #include "types.hpp"
 #include "exif.hpp"
 #include "canonmn.hpp"
 #include "iptc.hpp"
 #include "futils.hpp"
-#ifndef EXV_HAVE_TIMEGM
-# include "timegm.h"
-#endif
 
 // + standard includes
 #include <string>
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 2211c77..398518d 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -140,7 +140,7 @@ namespace Exiv2 {
         Blob psBlob;
         // Data is rounded to be even
         const uint32_t sizeOldData = sizeHdr + sizeIptc + (sizeIptc & 1);
-        const uint32_t sizeFront = record - pPsData;
+        const uint32_t sizeFront = static_cast<uint32_t>(record - pPsData);
         const uint32_t sizeEnd = sizePsData - sizeFront - sizeOldData;
 
         // Write data before old record.
diff --git a/src/timegm.h b/src/timegm.h
index 58f7be0..2d4a09a 100644
--- a/src/timegm.h
+++ b/src/timegm.h
@@ -6,6 +6,11 @@
 #ifndef TIMEGM_H_
 #define TIMEGM_H_
 
+/* Visual Studio C++ 2005 (8.0) uses 64 bit time_t, which doesn't work */
+#if defined _MSV_VER && _MSC_VER >= 1400
+# define _USE_32BIT_TIME_T
+#endif
+
 #include <time.h>
 
 /*
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index fe1a522..6752759 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -60,7 +60,7 @@ $binpath/exiv2 -pt $filename
 
 num=480
 filename=`prep_file $num`
-$binpath/largeiptc-test $filename ../data/smiley1.jpg.ixgd
+$binpath/largeiptc-test $filename ../data/imagemagick.png
 
 ) > $results 2>&1
 
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 20d17c8..c5c8355 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -236,10 +236,10 @@ Exif.Photo.ExifVersion                       Undefined   4  48 50 50 48
 Exif.Photo.PixelXDimension                   Short       1  3173
 Exif.Photo.PixelYDimension                   Short       1  2011
 ------> Bug 480 <-------
-Reading 67070 bytes from ../data/smiley1.jpg.ixgd
+Reading 144766 bytes from ../data/imagemagick.png
 IPTC fields: 0
-IPTC fields: 67079
-IRB buffer : 67092
+IPTC fields: 144775
+IRB buffer : 144788
 Comparing IPTC and IRB size... ok
 Comparing IPTC and IRB data... ok
 Caught Exiv2 exception 'Size of IPTC JPEG segment is larger than 65535 bytes'

-- 
exiv2 packaging