Add RobidouxSharp filter depreciate Bessel Filter and Static Gravity

[imagemagick] / MagickCore / draw-private.h

diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h
index b6aee7bd2ddc2ad7a1039eabb56e936feb7a9229..79b6c83381a1156c557b5fc6ab6b31752beb9f49 100644 (file)
--- a/MagickCore/draw-private.h
+++ b/MagickCore/draw-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2012 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.
@@ -27,7 +27,7 @@ extern "C" {
 #include "MagickCore/memory_.h"
 
 static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
-  const ssize_t x,const ssize_t y,PixelPacket *fill,ExceptionInfo *exception)
+  const ssize_t x,const ssize_t y,PixelInfo *fill,ExceptionInfo *exception)
 {
   if (draw_info->fill_pattern == (Image *) NULL)
     {
@@ -41,25 +41,15 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
     MagickBooleanType
       status;
 
-    Quantum
-      pixel[MaxPixelChannels];
-
     pattern=draw_info->fill_pattern;
-#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
-    #pragma omp critical
-#endif
-    status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod,x+
-      pattern->tile_offset.x,y+pattern->tile_offset.y,pixel,exception);
-    fill->red=(double) pixel[RedPixelChannel];
-    fill->green=(double) pixel[GreenPixelChannel];
-    fill->blue=(double) pixel[BluePixelChannel];
-    fill->alpha=(double) pixel[AlphaPixelChannel];
+    status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+
+      pattern->tile_offset.x,y+pattern->tile_offset.y,fill,exception);
     return(status);
   }
 }
 
 static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
-  const ssize_t x,const ssize_t y,PixelPacket *stroke,ExceptionInfo *exception)
+  const ssize_t x,const ssize_t y,PixelInfo *stroke,ExceptionInfo *exception)
 {
   if (draw_info->stroke_pattern == (Image *) NULL)
     {
@@ -73,19 +63,9 @@ static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
     MagickBooleanType
       status;
 
-    Quantum
-      pixel[MaxPixelChannels];
-
     pattern=draw_info->stroke_pattern;
-#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
-  #pragma omp critical
-#endif
-    status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod,x+
-      pattern->tile_offset.x,y+pattern->tile_offset.y,pixel,exception);
-    stroke->red=(double) pixel[RedPixelChannel];
-    stroke->green=(double) pixel[GreenPixelChannel];
-    stroke->blue=(double) pixel[BluePixelChannel];
-    stroke->alpha=(double) pixel[AlphaPixelChannel];
+    status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+
+      pattern->tile_offset.x,y+pattern->tile_offset.y,stroke,exception);
     return(status);
   }
 }