diff options
| -rw-r--r-- | MagickCore/timer.c | 10 | ||||
| -rw-r--r-- | coders/cin.c | 8 | ||||
| -rw-r--r-- | coders/mat.c | 10 | ||||
| -rw-r--r-- | coders/pdf.c | 8 |
4 files changed, 18 insertions, 18 deletions
diff --git a/MagickCore/timer.c b/MagickCore/timer.c index 8e7957061..56c7323cf 100644 --- a/MagickCore/timer.c +++ b/MagickCore/timer.c @@ -259,14 +259,14 @@ MagickExport ssize_t FormatMagickTime(const time_t time,const size_t length, count; struct tm - gm_time; + utc_time; assert(timestamp != (char *) NULL); - GetMagickUTCtime(&time,&gm_time); + GetMagickUTCtime(&time,&utc_time); count=FormatLocaleString(timestamp,length, - "%04d-%02d-%02dT%02d:%02d:%02d%+03d:00",gm_time.tm_year+1900, - gm_time.tm_mon+1,gm_time.tm_mday,gm_time.tm_hour,gm_time.tm_min, - gm_time.tm_sec,0); + "%04d-%02d-%02dT%02d:%02d:%02d%+03d:00",utc_time.tm_year+1900, + utc_time.tm_mon+1,utc_time.tm_mday,utc_time.tm_hour,utc_time.tm_min, + utc_time.tm_sec,0); return(count); } diff --git a/coders/cin.c b/coders/cin.c index bc83e3ce7..c04cce3aa 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -933,7 +933,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, y; struct tm - local_time; + utc_time; time_t seconds; @@ -992,9 +992,9 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, offset+=WriteBlob(image,sizeof(cin.file.filename),(unsigned char *) cin.file.filename); seconds=GetMagickTime(); - GetMagickUTCtime(&seconds,&local_time); + GetMagickUTCtime(&seconds,&utc_time); (void) memset(timestamp,0,sizeof(timestamp)); - (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&local_time); + (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time); (void) memset(cin.file.create_date,0,sizeof(cin.file.create_date)); (void) CopyMagickString(cin.file.create_date,timestamp,11); offset+=WriteBlob(image,sizeof(cin.file.create_date),(unsigned char *) @@ -1091,7 +1091,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, offset+=WriteBlob(image,sizeof(cin.origination.filename),(unsigned char *) cin.origination.filename); (void) memset(timestamp,0,sizeof(timestamp)); - (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&local_time); + (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time); (void) memset(cin.origination.create_date,0, sizeof(cin.origination.create_date)); (void) CopyMagickString(cin.origination.create_date,timestamp,11); diff --git a/coders/mat.c b/coders/mat.c index 4a4f85d51..776ed9a0f 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1586,7 +1586,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image, imageListLength; struct tm - local_time; + utc_time; time_t current_time; @@ -1607,13 +1607,13 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image, image->depth=8; current_time=GetMagickTime(); - GetMagickUTCtime(¤t_time,&local_time); + GetMagickUTCtime(¤t_time,&utc_time); (void) memset(MATLAB_HDR,' ',MagickMin(sizeof(MATLAB_HDR),124)); FormatLocaleString(MATLAB_HDR,sizeof(MATLAB_HDR), "MATLAB 5.0 MAT-file, Platform: %s, Created on: %s %s %2d %2d:%2d:%2d %d", - OsDesc,DayOfWTab[local_time.tm_wday],MonthsTab[local_time.tm_mon], - local_time.tm_mday,local_time.tm_hour,local_time.tm_min, - local_time.tm_sec,local_time.tm_year+1900); + OsDesc,DayOfWTab[utc_time.tm_wday],MonthsTab[utc_time.tm_mon], + utc_time.tm_mday,utc_time.tm_hour,utc_time.tm_min, + utc_time.tm_sec,utc_time.tm_year+1900); MATLAB_HDR[0x7C]=0; MATLAB_HDR[0x7D]=1; MATLAB_HDR[0x7E]='I'; diff --git a/coders/pdf.c b/coders/pdf.c index bb83cb7be..1b9bf6283 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -1340,7 +1340,7 @@ RestoreMSCWarning y; struct tm - local_time; + utc_time; time_t seconds; @@ -3009,10 +3009,10 @@ RestoreMSCWarning } (void) WriteBlobString(image,buffer); seconds=GetMagickTime(); - GetMagickUTCtime(&seconds,&local_time); + GetMagickUTCtime(&seconds,&utc_time); (void) FormatLocaleString(date,MagickPathExtent,"D:%04d%02d%02d%02d%02d%02d", - local_time.tm_year+1900,local_time.tm_mon+1,local_time.tm_mday, - local_time.tm_hour,local_time.tm_min,local_time.tm_sec); + utc_time.tm_year+1900,utc_time.tm_mon+1,utc_time.tm_mday, + utc_time.tm_hour,utc_time.tm_min,utc_time.tm_sec); (void) FormatLocaleString(buffer,MagickPathExtent,"/CreationDate (%s)\n", date); (void) WriteBlobString(image,buffer); |