From 09449f733819b0213c4c888761289b778e51809a Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 23 Jan 2010 03:08:36 +0000 Subject: [PATCH] --- config/configure.xml | 2 +- magick/cache.c | 9 +++++---- magick/utility.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/configure.xml b/config/configure.xml index cf0637bd2..1437a53bf 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,7 +10,7 @@ - + diff --git a/magick/cache.c b/magick/cache.c index c0cd9999d..5124510c1 100644 --- 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 2a010ff90..ce0616927 100644 --- 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; -- 2.40.0