From 84a87f7a6a69408c2921dceb6e3900616178dfa8 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 5 Apr 2019 10:04:13 -0400 Subject: [PATCH] ... --- MagickCore/cache-private.h | 2 +- MagickCore/cache.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h index d82dee7a0..b9e44a104 100644 --- a/MagickCore/cache-private.h +++ b/MagickCore/cache-private.h @@ -126,7 +126,7 @@ typedef struct _NexusInfo signature; struct _NexusInfo - *pixel_nexus; + *virtual_nexus; } NexusInfo; typedef struct _CacheInfo diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 35ed43b70..8f06e3ecd 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -276,7 +276,7 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads) { nexus_info[i]=(*nexus_info+i); if (i < (ssize_t) number_threads) - nexus_info[i]->pixel_nexus=(*nexus_info+number_threads+i); + nexus_info[i]->virtual_nexus=(*nexus_info+number_threads+i); nexus_info[i]->signature=MagickCoreSignature; } return(nexus_info); @@ -437,7 +437,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image, if (cache_info == (Cache) NULL) return(MagickFalse); p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,nexus_info->region.y, - nexus_info->region.width,nexus_info->region.height,nexus_info->pixel_nexus, + nexus_info->region.width,nexus_info->region.height,nexus_info->virtual_nexus, exception); q=nexus_info->pixels; number_pixels=(MagickSizeType) nexus_info->region.width* @@ -2795,7 +2795,7 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, /* Pixel request is outside cache extents. */ - virtual_nexus=nexus_info->pixel_nexus; + virtual_nexus=nexus_info->virtual_nexus; s=(unsigned char *) nexus_info->metacontent; (void) memset(virtual_pixel,0,cache_info->number_channels* sizeof(*virtual_pixel)); @@ -2918,7 +2918,7 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, EdgeY(y_offset,cache_info->rows),1UL,1UL,virtual_nexus, exception); r=GetVirtualMetacontentFromNexus(cache_info, - nexus_info->pixel_nexus); + nexus_info->virtual_nexus); break; } case RandomVirtualPixelMethod: @@ -3414,7 +3414,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, if (cache_info == (Cache) NULL) return(MagickFalse); p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,nexus_info->region.y, - nexus_info->region.width,nexus_info->region.height,nexus_info->pixel_nexus, + nexus_info->region.width,nexus_info->region.height,nexus_info->virtual_nexus, exception); q=nexus_info->pixels; number_pixels=(MagickSizeType) nexus_info->region.width* -- 2.40.0