From: cristy Date: Mon, 16 Apr 2012 16:54:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5786 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f82cff8bd8a29cec9b2682c2bc8f0d14bbaa0875;p=imagemagick --- diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index e14fdefb6..3eb8d5b75 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -786,10 +786,10 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixelInfo( assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickSignature); assert(id < (int) cache_view->number_threads); + GetPixelInfo(cache_view->image,pixel); p=GetVirtualPixelsFromNexus(cache_view->image, cache_view->virtual_pixel_method,x,y,1,1,cache_view->nexus_info[id], exception); - GetPixelInfo(cache_view->image,pixel); if (p == (const Quantum *) NULL) return(MagickFalse); GetPixelInfoPixel(cache_view->image,p,pixel); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 59b3f3d12..02062dcce 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -2326,9 +2326,9 @@ MagickExport MagickBooleanType GetOneVirtualPixelInfo(const Image *image, cache_info=(CacheInfo *) image->cache; assert(cache_info->signature == MagickSignature); assert(id < (int) cache_info->number_threads); + GetPixelInfo(image,pixel); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL, cache_info->nexus_info[id],exception); - GetPixelInfo(image,pixel); if (p == (const Quantum *) NULL) return(MagickFalse); GetPixelInfoPixel(image,p,pixel);