From 65dbf179a68ef460b4d5c6e81631cde8755c1a12 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 6 Oct 2011 17:32:04 +0000 Subject: [PATCH] --- MagickCore/cache-private.h | 2 +- MagickCore/cache-view.c | 2 +- MagickCore/cache.c | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h index 4a9a277eb..ab6a0a2d4 100644 --- a/MagickCore/cache-private.h +++ b/MagickCore/cache-private.h @@ -237,7 +237,7 @@ extern MagickPrivate Quantum const size_t,const size_t,NexusInfo *,ExceptionInfo *), *GetPixelCacheNexusPixels(const Cache,NexusInfo *), *QueueAuthenticNexus(Image *,const ssize_t,const ssize_t,const size_t, - const size_t,NexusInfo *,ExceptionInfo *); + const size_t,const MagickBooleanType,NexusInfo *,ExceptionInfo *); extern MagickPrivate size_t GetPixelCacheChannels(const Cache); diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index 43da94a2e..05ce877a1 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -883,7 +883,7 @@ MagickExport Quantum *QueueCacheViewAuthenticPixels(CacheView *cache_view, assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickSignature); assert(id < (int) cache_view->number_threads); - pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows, + pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,MagickFalse, cache_view->nexus_info[id],exception); return(pixels); } diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 4c0e9b77d..4624a5542 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -1656,7 +1656,7 @@ MagickPrivate Quantum *GetAuthenticPixelCacheNexus(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - q=QueueAuthenticNexus(image,x,y,columns,rows,nexus_info,exception); + q=QueueAuthenticNexus(image,x,y,columns,rows,MagickTrue,nexus_info,exception); if (q == (Quantum *) NULL) return((Quantum *) NULL); cache_info=(CacheInfo *) image->cache; @@ -4418,7 +4418,8 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image, % % Quantum *QueueAuthenticNexus(Image *image,const ssize_t x, % const ssize_t y,const size_t columns,const size_t rows, -% NexusInfo *nexus_info,ExceptionInfo *exception) +% const MagickBooleanType clone,NexusInfo *nexus_info, +% ExceptionInfo *exception) % % A description of each parameter follows: % @@ -4429,12 +4430,14 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image, % % o nexus_info: the cache nexus to set. % +% o clone: clone the pixel cache. +% % o exception: return any errors or warnings in this structure. % */ MagickPrivate Quantum *QueueAuthenticNexus(Image *image,const ssize_t x, - const ssize_t y,const size_t columns,const size_t rows,NexusInfo *nexus_info, - ExceptionInfo *exception) + const ssize_t y,const size_t columns,const size_t rows, + const MagickBooleanType clone,NexusInfo *nexus_info,ExceptionInfo *exception) { CacheInfo *cache_info; @@ -4454,7 +4457,7 @@ MagickPrivate Quantum *QueueAuthenticNexus(Image *image,const ssize_t x, assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); assert(image->cache != (Cache) NULL); - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + cache_info=(CacheInfo *) GetImagePixelCache(image,clone,exception); if (cache_info == (Cache) NULL) return((Quantum *) NULL); assert(cache_info->signature == MagickSignature); @@ -4540,8 +4543,8 @@ static Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x, cache_info=(CacheInfo *) image->cache; assert(cache_info->signature == MagickSignature); assert(id < (int) cache_info->number_threads); - q=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id], - exception); + q=QueueAuthenticNexus(image,x,y,columns,rows,MagickFalse, + cache_info->nexus_info[id],exception); return(q); } @@ -4627,8 +4630,8 @@ MagickExport Quantum *QueueAuthenticPixels(Image *image,const ssize_t x, return(q); } assert(id < (int) cache_info->number_threads); - q=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id], - exception); + q=QueueAuthenticNexus(image,x,y,columns,rows,MagickFalse, + cache_info->nexus_info[id],exception); return(q); } -- 2.40.0