(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 63c806354f1ded29ec3a4bfa6627a1fd40b32644..0b8e0b6125979393ecaf6471aea764151ada1003 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -2255,13 +2255,15 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image,
 %  The format of the GetOneVirtualMagickPixel() method is:
 %
 %      MagickBooleanType GetOneVirtualMagickPixel(const Image image,
-%        const ssize_t x,const ssize_t y,PixelInfo *pixel,
-%        ExceptionInfo exception)
+%        const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
+%        const ssize_t y,PixelInfo *pixel,ExceptionInfo exception)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
+%    o virtual_pixel_method: the virtual pixel method.
+%
 %    o x,y:  these values define the location of the pixel to return.
 %
 %    o pixel: return a pixel at the specified (x,y) location.
@@ -2270,7 +2272,8 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image,
 %
 */
 MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
-  const ssize_t x,const ssize_t y,PixelInfo *pixel,ExceptionInfo *exception)
+  const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
+  PixelInfo *pixel,ExceptionInfo *exception)
 {
   CacheInfo
     *cache_info;
@@ -2287,8 +2290,8 @@ MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  p=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
-    1UL,1UL,cache_info->nexus_info[id],exception);
+  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);

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 95fd84d22cc4166b8e05e91d5da05f1e3cea95f4..f83e15ff9a66dfd22725cca3b084738b591cbde1 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -33,8 +33,8 @@ extern MagickExport const void
   *GetVirtualMetacontent(const Image *);
 
 extern MagickExport MagickBooleanType
-  GetOneVirtualMagickPixel(const Image *,const ssize_t,const ssize_t,
-    PixelInfo *,ExceptionInfo *),
+  GetOneVirtualMagickPixel(const Image *,const VirtualPixelMethod,
+    const ssize_t,const ssize_t,PixelInfo *,ExceptionInfo *),
   GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,Quantum *,
     ExceptionInfo *),
   GetOneVirtualMethodPixel(const Image *,const VirtualPixelMethod,const ssize_t,

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 7ce26528f87ec21e1237131828d20c1a6e3935b2..a2e4ab2dfdf8e2760bb25dc55ea7785c89c2c398 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -43,6 +43,7 @@
 #include "MagickCore/studio.h"
 #include "MagickCore/artifact.h"
 #include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
 #include "MagickCore/cache-view.h"
 #include "MagickCore/client.h"
 #include "MagickCore/color.h"
@@ -2258,7 +2259,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             }
             default:
             {
-              (void) GetOneVirtualMagickPixel(composite_image,x-x_offset,y-
+              (void) GetOneVirtualMagickPixel(composite_image,
+                GetPixelCacheVirtualMethod(composite_image),x-x_offset,y-
                 y_offset,&composite,exception);
               break;
             }

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 797b385ec59d6b9952777672825e2adf901849ef..e89f51e4d8cd760ba51707776a5d8d3460b2bcf4 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -43,6 +43,7 @@
 #include "MagickCore/artifact.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
 #include "MagickCore/client.h"
 #include "MagickCore/color.h"
 #include "MagickCore/colorspace.h"
@@ -3822,8 +3823,9 @@ static MagickBooleanType XColorEditImage(Display *display,
             /*
               Update color information using floodfill algorithm.
             */
-            (void) GetOneVirtualMagickPixel(*image,(ssize_t) x_offset,
-              (ssize_t) y_offset,&target,exception);
+            (void) GetOneVirtualMagickPixel(*image,
+              GetPixelCacheVirtualMethod(*image),(ssize_t) x_offset,(ssize_t)
+              y_offset,&target,exception);
             if (method == FillToBorderMethod)
               {
                 target.red=(MagickRealType)
@@ -10162,8 +10164,9 @@ static MagickBooleanType XMatteEditImage(Display *display,
             /*
               Update matte information using floodfill algorithm.
             */
-            (void) GetOneVirtualMagickPixel(*image,(ssize_t) x_offset,
-              (ssize_t) y_offset,&target,exception);
+            (void) GetOneVirtualMagickPixel(*image,
+              GetPixelCacheVirtualMethod(*image),(ssize_t) x_offset,(ssize_t)
+              y_offset,&target,exception);
             if (method == FillToBorderMethod)
               {
                 target.red=(MagickRealType) ScaleShortToQuantum(

diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h
index def387d4c515cb266a3fb13954266486b55fc68c..963abdd5f22b9595c32d476f34ca3a3f71a47624 100644 (file)
--- a/MagickCore/draw-private.h
+++ b/MagickCore/draw-private.h
@@ -45,8 +45,8 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
     #pragma omp critical
 #endif
-    status=GetOneVirtualMagickPixel(pattern,x+pattern->tile_offset.x,
-      y+pattern->tile_offset.y,fill,exception);
+    status=GetOneVirtualMagickPixel(pattern,TileVirtualPixelMethod,x+
+      pattern->tile_offset.x,y+pattern->tile_offset.y,fill,exception);
     return(status);
   }
 }
@@ -70,8 +70,8 @@ static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
   #pragma omp critical
 #endif
-    status=GetOneVirtualMagickPixel(pattern,x+pattern->tile_offset.x,y+
-      pattern->tile_offset.y,stroke,exception);
+    status=GetOneVirtualMagickPixel(pattern,TileVirtualPixelMethod,x+
+      pattern->tile_offset.x,y+pattern->tile_offset.y,stroke,exception);
     return(status);
   }
 }

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 3f12950f0b7114b49971e3f2c3e974cb74eeda81..b3ed8197e3f620e5884dd24f34ba08116ef62ba7 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4235,7 +4235,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           PixelInfo
             target;
 
-          (void) GetOneVirtualMagickPixel(image,x,y,&target,exception);
+          (void) GetOneVirtualMagickPixel(image,TileVirtualPixelMethod,x,y,
+            &target,exception);
           if (primitive_info->method == FillToBorderMethod)
             {
               target.red=(MagickRealType) draw_info->border_color.red;
@@ -4363,7 +4364,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           PixelInfo
             target;
 
-          (void) GetOneVirtualMagickPixel(image,x,y,&target,exception);
+          (void) GetOneVirtualMagickPixel(image,TileVirtualPixelMethod,x,y,
+            &target,exception);
           if (primitive_info->method == FillToBorderMethod)
             {
               target.red=(MagickRealType) draw_info->border_color.red;

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 0e434908f71cf16b6cc5913f9aca69ce1906bbc2..7e47c6682265f12129f986c569439da817947871 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -7522,8 +7522,8 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows,
   /*
     Show center pixel color.
   */
-  (void) GetOneVirtualMagickPixel(windows->image.image,(ssize_t)
-    windows->magnify.x,(ssize_t) windows->magnify.y,&pixel,exception);
+  (void) GetOneVirtualMagickPixel(windows->image.image,TileVirtualPixelMethod,
+    (ssize_t) windows->magnify.x,(ssize_t) windows->magnify.y,&pixel,exception);
   (void) FormatLocaleString(tuple,MaxTextExtent,"%d,%d: ",
     windows->magnify.x,windows->magnify.y);
   (void) ConcatenateMagickString(tuple,"(",MaxTextExtent);

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index fa030552d942e369be06fc98b30dc7ea27ecdb52..4aa0cdbfe8895129c4ba81c51413779cc3b72bd4 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -3046,8 +3046,8 @@ WandExport MagickBooleanType MagickFloodfillPaintImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   draw_info=CloneDrawInfo(wand->image_info,(DrawInfo *) NULL);
   PixelGetQuantumPacket(fill,&draw_info->fill);
-  (void) GetOneVirtualMagickPixel(wand->images,x % wand->images->columns,
-    y % wand->images->rows,&target,wand->exception);
+  (void) GetOneVirtualMagickPixel(wand->images,TileVirtualPixelMethod,x %
+    wand->images->columns,y % wand->images->rows,&target,wand->exception);
   if (bordercolor != (PixelWand *) NULL)
     PixelGetMagickColor(bordercolor,&target);
   wand->images->fuzz=fuzz;