[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=258bc8b

The following commit has been merged in the master branch:
commit 258bc8b561db0445859f81979ee9237080ec8102
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Jul 20 06:05:42 2012 +0000

    Fixing compilation error on mac/linux.
---
 samples/geotag.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index bd5a890..dc6f7ff 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -135,9 +135,9 @@ int timeZoneAdjust()
     GetTimeZoneInformation( &TimeZoneInfo );
     int offset = - ((int)TimeZoneInfo.Bias + (int)TimeZoneInfo.DaylightBias) * 60;
 #else
+    struct tm local ; memcpy(&local,localtime(&now),sizeof(local));
     int offset = local.tm_gmtoff ;
 #endif
-//  struct tm local ; memcpy(&local,localtime(&now),sizeof(local));
 //  struct tm utc   ; memcpy(&utc  ,gmtime   (&now),sizeof(utc  ));
 //  printf("local: offset = %6ld dst = %d time = %s", offset,local.tm_isdst, asctime(&local));
 //  printf("utc  : offset = %6ld dst = %d time = %s", 0     ,utc  .tm_isdst, asctime(&utc  ));
@@ -485,7 +485,7 @@ int main(int argc, char* const argv[])
         size_t count = 0   ;
         time_t t     = 0   ;
         int   type   = getFileType(arg,count) ;
-        printf("%s %s %d",arg,types[type],count) ;
+        printf("%s %s %d",arg,types[type],(int)count) ;
         if ( type == typeImage ) {
             t = readImageTime(arg) ;
             if ( t ) printf(" %ld ",(long int)t);

-- 
exiv2 packaging