(no commit message)

[imagemagick] / magick / nt-base.c

diff --git a/magick/nt-base.c b/magick/nt-base.c
index 94c6e000a2e9c53ceb32da66188e801e3a82cc1e..166fc6f04b94b1be35a3d641bd4ed3b12cab9eab 100644 (file)
--- a/magick/nt-base.c
+++ b/magick/nt-base.c
@@ -17,7 +17,7 @@
 %                                December 1996                                %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -946,7 +946,6 @@ static int NTLocateGhostscript(const char **product_family,int *major_version,
   }
   if (status == FALSE)
     {
-      i=0;
       *major_version=0;
       *minor_version=0;
     }
@@ -1380,7 +1379,7 @@ MagickExport DIR *NTOpenDirectory(const char *path)
     MaxTextExtent);
   if (length >= MaxTextExtent)
     return((DIR *) NULL);
-  entry=(DIR *) AcquireAlignedMemory(1,sizeof(DIR));
+  entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
   if (entry != (DIR *) NULL)
     {
       entry->firsttime=TRUE;
@@ -2075,7 +2074,7 @@ MagickExport int NTTruncateFile(int file,off_t length)
   DWORD
     file_pointer;
 
-  ssize_t
+  long
     file_handle,
     high,
     low;
@@ -2083,8 +2082,8 @@ MagickExport int NTTruncateFile(int file,off_t length)
   file_handle=_get_osfhandle(file);
   if (file_handle == -1L)
     return(-1);
-  low=(ssize_t) (length & 0xffffffffUL);
-  high=(ssize_t) ((((MagickOffsetType) length) >> 32) & 0xffffffffUL);
+  low=(long) (length & 0xffffffffUL);
+  high=(long) ((((MagickOffsetType) length) >> 32) & 0xffffffffUL);
   file_pointer=SetFilePointer((HANDLE) file_handle,low,&high,FILE_BEGIN);
   if ((file_pointer == 0xFFFFFFFF) && (GetLastError() != NO_ERROR))
     return(-1);