xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cygwin compilation warning on geotag.cpp

Browse Source
v0.27.3
Robin Mills 11 years ago
parent 3b0404e7b6
commit 94e6dcbf50
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

13
samples/geotag.cpp
Unescape Escape View File

@ -417,7 +417,6 @@ time_t parseTime(const char* arg,bool bAdjust)
int timeZoneAdjust() int timeZoneAdjust()
{ {
time_t now = time(NULL); time_t now = time(NULL);
struct tm local = *localtime(&now) ;
int offset; int offset;
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -425,15 +424,17 @@ int timeZoneAdjust()
GetTimeZoneInformation( &TimeZoneInfo ); GetTimeZoneInformation( &TimeZoneInfo );
offset = - (((int)TimeZoneInfo.Bias + (int)TimeZoneInfo.DaylightBias) * 60); offset = - (((int)TimeZoneInfo.Bias + (int)TimeZoneInfo.DaylightBias) * 60);
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
struct tm lcopy = *localtime(&now); struct tm lcopy = *localtime(&now);
time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy, so don't use local time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy
offset = (int) ( ((long signed int) gmt) - ((long signed int) now) ) ; offset = (int) ( ((long signed int) gmt) - ((long signed int) now) ) ;
#elif defined(OS_SOLARIS) #elif defined(OS_SOLARIS)
struct tm local = *localtime(&now) ;
time_t local_tt = (int) mktime(&local); time_t local_tt = (int) mktime(&local);
time_t time_gmt = (int) mktime(gmtime(&now)); time_t time_gmt = (int) mktime(gmtime(&now));
offset = time_gmt - local_tt; offset = time_gmt - local_tt;
#else #else
offset = local.tm_gmtoff ; struct tm local = *localtime(&now) ;
offset = local.tm_gmtoff ;
#endif #endif
#if 0 #if 0

Write Preview
Loading…
Cancel
Save