]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Sat, 5 Mar 2016 00:24:17 +0000 (19:24 -0500)
committerCristy <urban-warrior@imagemagick.org>
Sat, 5 Mar 2016 00:24:17 +0000 (19:24 -0500)
MagickCore/memory.c
configure

index 01f8e91428f5bcf0268e3c4a5712ed51836a4754..c9e27a18e398c1093258b3c03f8db016224ab011 100644 (file)
@@ -627,7 +627,11 @@ MagickExport MemoryInfo *AcquireVirtualMemory(const size_t count,
           file=AcquireUniqueFileResource(memory_info->filename);
           if (file != -1)
             {
-              if ((lseek(file,extent-1,SEEK_SET) == (extent-1)) &&
+              MagickOffsetType
+                offset;
+
+              offset=(MagickOffsetType) lseek(file,extent-1,SEEK_SET);
+              if ((offset == (MagickOffsetType) (extent-1)) &&
                   (write(file,"",1) == 1))
                 {
                   memory_info->blob=MapBlob(file,IOMode,0,extent);
index 416d705643ba9e638f0400068da4164587be1806..3289a6324e39df7772f9338be249b527e3d468da 100755 (executable)
--- a/configure
+++ b/configure
@@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=17794:1a295fe:20160302
+MAGICK_GIT_REVISION=17798:311b97d:20160303
 
 
 # Substitute library versioning