(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index cf0637bd2d8b02cc1d9a55e790053a88de1d3b9a..1437a53bff62e6c6c0b66599dc5f6eb17932decd 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="LIB_VERSION" value="0x659"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,9,1"/>
   <configure name="RELEASE_DATE" value="2010-01-22"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.5.9"/>

diff --git a/magick/cache.c b/magick/cache.c
index c0cd9999d0abd80978cb48d9462a01263f0dd51d..5124510c14c93381ca7c9bb75a85212bde0fe35a 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -3893,9 +3893,9 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
   if ((image_nexus == (NexusInfo **) NULL) ||
       (clip_nexus == (NexusInfo **) NULL))
     ThrowBinaryException(CacheError,"UnableToGetCacheNexus",image->filename);
-  p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,nexus_info->region.y,
-    nexus_info->region.width,nexus_info->region.height,image_nexus[0],
-    exception);
+  p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,
+    nexus_info->region.y,nexus_info->region.width,nexus_info->region.height,
+    image_nexus[0],exception);
   indexes=GetPixelCacheNexusIndexes(image->cache,image_nexus[0]);
   q=nexus_info->pixels;
   nexus_indexes=nexus_info->indexes;
@@ -4287,7 +4287,8 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
       (cache_info->reference_count == 1))
     {
       LockSemaphoreInfo(cache_info->semaphore);
-      if ((cache_info->mode != ReadMode) && (cache_info->type != MemoryCache) &&
+      if ((cache_info->mode != ReadMode) &&
+          (cache_info->type != MemoryCache) &&
           (cache_info->reference_count == 1))
         {
           int

diff --git a/magick/utility.c b/magick/utility.c
index 2a010ff907b817587f0312f4d41887c6a2380ee8..ce0616927fc0bd7fba14120883c59195945898be 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -1032,10 +1032,10 @@ MagickExport long GetMagickPageSize(void)
     return(page_size);
 #if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
   page_size=sysconf(_SC_PAGE_SIZE);
-#endif
+#else
 #if defined(MAGICKCORE_HAVE_GETPAGESIZE)
-  if (page_size <= 0)
-    page_size=getpagesize();
+  page_size=getpagesize();
+#endif
 #endif
   if (page_size <= 0)
     page_size=16384;