(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index cfd0f404e13270e1bf9b0116d183a6d9b06d9c4e..660b71e69cada8a0f14c4555fa0f5b82d76d195d 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -2242,68 +2242,6 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   G e t O n e V i r t u a l M a g i c k P i x e l                           %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  GetOneVirtualMagickPixel() returns a single pixel at the specified (x,y)
-%  location.  The image background color is returned if an error occurs.  If
-%  you plan to modify the pixel, use GetOneAuthenticPixel() instead.
-%
-%  The format of the GetOneVirtualMagickPixel() method is:
-%
-%      MagickBooleanType GetOneVirtualMagickPixel(const Image image,
-%        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.
-%
-%    o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
-  const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
-  PixelInfo *pixel,ExceptionInfo *exception)
-{
-  CacheInfo
-    *cache_info;
-
-  const int
-    id = GetOpenMPThreadId();
-
-  register const Quantum
-    *p;
-
-  assert(image != (const Image *) NULL);
-  assert(image->signature == MagickSignature);
-  assert(image->cache != (Cache) NULL);
-  cache_info=(CacheInfo *) image->cache;
-  assert(cache_info->signature == MagickSignature);
-  assert(id < (int) cache_info->number_threads);
-  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);
-  return(MagickTrue);
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   G e t O n e V i r t u a l P i x e l                                       %
 %                                                                             %
 %                                                                             %
@@ -2462,6 +2400,68 @@ static MagickBooleanType GetOneVirtualPixelFromCache(const Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   G e t O n e V i r t u a l P i x e l I n f o                               %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetOneVirtualPixelInfo() returns a single pixel at the specified (x,y)
+%  location.  The image background color is returned if an error occurs.  If
+%  you plan to modify the pixel, use GetOneAuthenticPixel() instead.
+%
+%  The format of the GetOneVirtualPixelInfo() method is:
+%
+%      MagickBooleanType GetOneVirtualPixelInfo(const Image image,
+%        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.
+%
+%    o exception: return any errors or warnings in this structure.
+%
+*/
+MagickExport MagickBooleanType GetOneVirtualPixelInfo(const Image *image,
+  const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
+  PixelInfo *pixel,ExceptionInfo *exception)
+{
+  CacheInfo
+    *cache_info;
+
+  const int
+    id = GetOpenMPThreadId();
+
+  register const Quantum
+    *p;
+
+  assert(image != (const Image *) NULL);
+  assert(image->signature == MagickSignature);
+  assert(image->cache != (Cache) NULL);
+  cache_info=(CacheInfo *) image->cache;
+  assert(cache_info->signature == MagickSignature);
+  assert(id < (int) cache_info->number_threads);
+  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);
+  return(MagickTrue);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 +   G e t P i x e l C a c h e C o l o r s p a c e                             %
 %                                                                             %
 %                                                                             %
@@ -3786,9 +3786,8 @@ MagickPrivate const Quantum *GetVirtualPixelsNexus(const Cache cache,
 %
 */
 
-static inline void MagickPixelCompositeMask(const PixelInfo *p,
-  const MagickRealType alpha,const PixelInfo *q,
-  const MagickRealType beta,PixelInfo *composite)
+static inline void MaskPixelOver(const PixelInfo *p,const MagickRealType alpha,
+  const PixelInfo *q,const MagickRealType beta,PixelInfo *composite)
 {
   MagickRealType
     gamma;
@@ -3866,7 +3865,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
       break;
     GetPixelInfoPixel(image,p,&alpha);
     GetPixelInfoPixel(image,q,&beta);
-    MagickPixelCompositeMask(&beta,(MagickRealType) GetPixelIntensity(image,r),
+    MaskPixelOver(&beta,(MagickRealType) GetPixelIntensity(image,r),
       &alpha,alpha.alpha,&beta);
     SetPixelRed(image,ClampToQuantum(beta.red),q);
     SetPixelGreen(image,ClampToQuantum(beta.green),q);

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 6902644f50d3a76310af22f3acc0e563bf8c15ac..4d1f6bac4c02ecb5dcc717fd6e5eefe0d68684ba 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -33,7 +33,7 @@ extern MagickExport const void
   *GetVirtualMetacontent(const Image *);
 
 extern MagickExport MagickBooleanType
-  GetOneVirtualMagickPixel(const Image *,const VirtualPixelMethod,
+  GetOneVirtualPixelInfo(const Image *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,PixelInfo *,ExceptionInfo *),
   GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,Quantum *,
     ExceptionInfo *),

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index ee1437d51eb2c154779c92369ea0366c0f889cd7..a8bd90fcf0d7bbfddc9a79227511384962828f07 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2277,7 +2277,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             }
             default:
             {
-              (void) GetOneVirtualMagickPixel(composite_image,
+              (void) GetOneVirtualPixelInfo(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 519019030c2642f39f817722213a26f5576dba30..6d0369af1b61949b3d0e118c549bd55b959462e1 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -3826,7 +3826,7 @@ static MagickBooleanType XColorEditImage(Display *display,
             /*
               Update color information using floodfill algorithm.
             */
-            (void) GetOneVirtualMagickPixel(*image,
+            (void) GetOneVirtualPixelInfo(*image,
               GetPixelCacheVirtualMethod(*image),(ssize_t) x_offset,(ssize_t)
               y_offset,&target,exception);
             if (method == FillToBorderMethod)
@@ -10168,7 +10168,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
             /*
               Update matte information using floodfill algorithm.
             */
-            (void) GetOneVirtualMagickPixel(*image,
+            (void) GetOneVirtualPixelInfo(*image,
               GetPixelCacheVirtualMethod(*image),(ssize_t) x_offset,(ssize_t)
               y_offset,&target,exception);
             if (method == FillToBorderMethod)

diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h
index 963abdd5f22b9595c32d476f34ca3a3f71a47624..0528d9998bfa17229925b699ce46ddeea506d322 100644 (file)
--- a/MagickCore/draw-private.h
+++ b/MagickCore/draw-private.h
@@ -45,7 +45,7 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
     #pragma omp critical
 #endif
-    status=GetOneVirtualMagickPixel(pattern,TileVirtualPixelMethod,x+
+    status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+
       pattern->tile_offset.x,y+pattern->tile_offset.y,fill,exception);
     return(status);
   }
@@ -70,7 +70,7 @@ static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
   #pragma omp critical
 #endif
-    status=GetOneVirtualMagickPixel(pattern,TileVirtualPixelMethod,x+
+    status=GetOneVirtualPixelInfo(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 2a80d74df549c2b6d015c4e50c4c57cfc1f1f68d..857015ab1f4bc9a42588e2b138730f05a56bd3c3 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4224,7 +4224,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           PixelInfo
             target;
 
-          (void) GetOneVirtualMagickPixel(image,TileVirtualPixelMethod,x,y,
+          (void) GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
             &target,exception);
           if (primitive_info->method == FillToBorderMethod)
             {
@@ -4353,7 +4353,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           PixelInfo
             target;
 
-          (void) GetOneVirtualMagickPixel(image,TileVirtualPixelMethod,x,y,
+          (void) GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
             &target,exception);
           if (primitive_info->method == FillToBorderMethod)
             {

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index d7858f181086d7af476d730c39fabbebef0f6064..edf50c721afe704b7cf9197aacf880d1eccc39c0 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -543,7 +543,7 @@ extern "C" {
 #define GetOneCacheViewVirtualMethodPixel  PrependMagickMethod(GetOneCacheViewVirtualMethodPixel)
 #define GetOneCacheViewVirtualPixel  PrependMagickMethod(GetOneCacheViewVirtualPixel)
 #define GetOnePixel  PrependMagickMethod(GetOnePixel)
-#define GetOneVirtualMagickPixel  PrependMagickMethod(GetOneVirtualMagickPixel)
+#define GetOneVirtualPixelInfo  PrependMagickMethod(GetOneVirtualPixelInfo)
 #define GetOneVirtualMethodPixel  PrependMagickMethod(GetOneVirtualMethodPixel)
 #define GetOneVirtualPixel  PrependMagickMethod(GetOneVirtualPixel)
 #define GetOptimalKernelWidth1D  PrependMagickMethod(GetOptimalKernelWidth1D)

diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h
deleted file mode 100644 (file)
index 50e849d..0000000
--- a/MagickCore/pixel-private.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
-  dedicated to making software imaging solutions freely available.
-  
-  You may not use this file except in compliance with the License.
-  obtain a copy of the License at
-  
-    http://www.imagemagick.org/script/license.php
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  MagickCore image pixel private methods.
-*/
-#ifndef _MAGICKCORE_PIXEL_PRIVATE_H
-#define _MAGICKCORE_PIXEL_PRIVATE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#include <magick/exception-private.h>
-#include <magick/image.h>
-#include <magick/color.h>
-#include <magick/image-private.h>
-#include <magick/quantum-private.h>
-
-static inline MagickPixelInfo *CloneMagickPixelInfo(
-  const MagickPixelInfo *pixel)
-{
-  MagickPixelInfo
-    *clone_pixel;
-
-  clone_pixel=(MagickPixelInfo *) AcquireMemory(sizeof(*clone_pixel));
-  if (clone_pixel == (MagickPixelInfo *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  *clone_pixel=(*pixel);
-  return(clone_pixel);
-}
-
-static inline MagickBooleanType IsGrayPixel(const PixelInfo *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) && 
-      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
-    return(MagickTrue);
-#else
-  {
-    double
-      alpha,
-      beta;
-
-    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
-    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
-    if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
-      return(MagickTrue);
-  }
-#endif
-  return(MagickFalse);
-}
-
-static inline MagickBooleanType IsMonochromePixel(const PixelInfo *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if (((GetPixelRed(pixel) == 0) ||
-       (GetPixelRed(pixel) == (Quantum) QuantumRange)) &&
-      (GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
-      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
-    return(MagickTrue);
-#else
-  {
-    double
-      alpha,
-      beta;
-
-    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
-    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
-    if (((fabs(GetPixelRed(pixel)) <= MagickEpsilon) ||
-         (fabs(GetPixelRed(pixel)-QuantumRange) <= MagickEpsilon)) &&
-        (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
-      return(MagickTrue);
-    }
-#endif
-  return(MagickFalse);
-}
-
-static inline void GetPixelInfo(const Image *image,
-  const MagickPixelInfo *pixel,PixelInfo *color,IndexPacket *index)
-{
-  SetPixelRed(color,ClampToQuantum(pixel->red));
-  SetPixelGreen(color,ClampToQuantum(pixel->green));
-  SetPixelBlue(color,ClampToQuantum(pixel->blue));
-  if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    SetPixelAlpha(color,ClampToQuantum(pixel->alpha));
-  if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
-    SetPixelBlack(index,ClampToQuantum(pixel->black));
-  if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
-    SetPixelIndex(index,ClampToQuantum(pixel->index));
-}
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index a55d0d6ce4c95ca75c6c3d8f6d04e15302349706..fd07dce72e8b035509355db063a26e66dc5d9b92 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -7527,7 +7527,7 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows,
   /*
     Show center pixel color.
   */
-  (void) GetOneVirtualMagickPixel(windows->image.image,TileVirtualPixelMethod,
+  (void) GetOneVirtualPixelInfo(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);

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 36cac458f537719c7445bf40f1b379a867aa188d..692cbc815875d2f34fc1fd64d1be01aeb90f6afc 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -3046,7 +3046,7 @@ 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,TileVirtualPixelMethod,x %
+  (void) GetOneVirtualPixelInfo(wand->images,TileVirtualPixelMethod,x %
     wand->images->columns,y % wand->images->rows,&target,wand->exception);
   if (bordercolor != (PixelWand *) NULL)
     PixelGetMagickColor(bordercolor,&target);

diff --git a/coders/msl.c b/coders/msl.c
index 7aafa3edaba3d30efa24839faebecdaf88c6eca6..2c60c54b319af0e4ade0879eefb921f693e193e1 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1697,7 +1697,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                         &geometry,&exception);
                       if ((flags & HeightValue) == 0)
                         geometry.height=geometry.width;
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;
@@ -1712,7 +1712,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   if (LocaleCompare(keyword,"x") == 0)
                     {
                       geometry.x=StringToLong(value);
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;
@@ -1727,7 +1727,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   if (LocaleCompare(keyword,"y") == 0)
                     {
                       geometry.y=StringToLong(value);
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;
@@ -3731,7 +3731,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                         &geometry,&exception);
                       if ((flags & HeightValue) == 0)
                         geometry.height=geometry.width;
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;
@@ -3758,7 +3758,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   if (LocaleCompare(keyword,"x") == 0)
                     {
                       geometry.x=StringToLong(value);
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;
@@ -3773,7 +3773,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   if (LocaleCompare(keyword,"y") == 0)
                     {
                       geometry.y=StringToLong(value);
-                      (void) GetOneVirtualMagickPixel(msl_info->image[n],
+                      (void) GetOneVirtualPixelInfo(msl_info->image[n],
                         TileVirtualPixelMethod,geometry.x,geometry.y,&target,
                         &exception);
                       break;