From: cristy Date: Wed, 11 Dec 2013 18:13:15 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3049 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e654b8bb2c497cd20558484115c13811108f9a3f;p=imagemagick --- diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 73c1761d8..2216df549 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1453,7 +1453,7 @@ MagickPrivate void *NTMapMemory(char *address,size_t length,int protection, CloseHandle(map_handle); } if (map == (void *) NULL) - return((void *) MAP_FAILED); + return((void *) ((char *) MAP_FAILED)); return((void *) ((char *) map)); } @@ -2232,8 +2232,10 @@ MagickPrivate int NTTruncateFile(int file,off_t length) DWORD file_pointer; + HANDLE + file_handle; + long - file_handle, high, low; @@ -2242,10 +2244,10 @@ MagickPrivate int NTTruncateFile(int file,off_t length) return(-1); low=(long) (length & 0xffffffffUL); high=(long) ((((MagickOffsetType) length) >> 32) & 0xffffffffUL); - file_pointer=SetFilePointer((HANDLE) file_handle,low,&high,FILE_BEGIN); + file_pointer=SetFilePointer(file_handle,low,&high,FILE_BEGIN); if ((file_pointer == 0xFFFFFFFF) && (GetLastError() != NO_ERROR)) return(-1); - if (SetEndOfFile((HANDLE) file_handle) == 0) + if (SetEndOfFile(file_handle) == 0) return(-1); return(0); }