Changeset 229 for ImageMagick/trunk/magick/cache.c

Timestamp:

09/27/09 08:19:13 (6 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/cache.c (modified) (5 diffs)

ImageMagick/trunk/magick/cache.c

@@ -4123 +4123 @@
 
   long
-    pagesize;
+    page_size;
 
   MagickBooleanType
@@ -4135 +4135 @@
   assert(filename != (const char *) NULL);
   assert(offset != (MagickOffsetType *) NULL);
-  pagesize=(-1);
-#if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PAGESIZE)
-  pagesize=sysconf(_SC_PAGESIZE);
-#elif defined(MAGICKCORE_HAVE_GETPAGESIZE) && defined(MAGICKCORE_POSIX_SUPPORT)
-  pagesize=getpagesize();
-#endif
-  if (pagesize <= 0)
-    pagesize=4096;
+  page_size=GetMagickPageSize();
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
@@ -4159 +4152 @@
       if (OpenPixelCache(image,ReadMode,exception) == MagickFalse)
         return(MagickFalse);
-      *offset+=cache_info->length+pagesize-(cache_info->length % pagesize);
+      *offset+=cache_info->length+page_size-(cache_info->length % page_size);
       return(MagickTrue);
     }
@@ -4180 +4173 @@
               (void) CopyMagickString(cache_info->cache_filename,filename,
                 MaxTextExtent);
-              *offset+=cache_info->length+pagesize-(cache_info->length %
-                pagesize);
+              *offset+=cache_info->length+page_size-(cache_info->length %
+                page_size);
               (void) UnlockSemaphoreInfo(cache_info->semaphore);
               cache_info=(CacheInfo *) ReferencePixelCache(cache_info);
@@ -4210 +4203 @@
        status=ClonePixelCachePixels(cache_info,clone_info,&image->exception);
     }
-  *offset+=cache_info->length+pagesize-(cache_info->length % pagesize);
+  *offset+=cache_info->length+page_size-(cache_info->length % page_size);
   clone_info=(CacheInfo *) DestroyPixelCache(clone_info);
   return(status);