commit f05d4947caf1bc27fbec041eb37c474a80c83c0b
author cristy <urban-warrior@git.imagemagick.org> Sat Mar 17 16:26:09 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sat Mar 17 16:26:09 2012 +0000
tree 619ba7423bcc7dcf2fe0bcc712bd026f0bf6896d
parent e5840b2f205399022cbb82c827045e289b358c05

MagickCore/xwindow.c

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index fdde2b5..47831dd 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -484,9 +484,6 @@
   Pixmap
     annotate_pixmap;
 
-  Quantum
-    virtual_pixel[CompositePixelChannel];
-
   unsigned int
     depth,
     height,
@@ -559,16 +556,8 @@
   x=0;
   y=0;
   (void) XParseGeometry(annotate_info->geometry,&x,&y,&width,&height);
-  (void) GetOneVirtualPixel(image,(ssize_t) x,(ssize_t) y,virtual_pixel,
-    exception);
-  annotate_image->background_color.red=(double)
-    virtual_pixel[RedPixelChannel];
-  annotate_image->background_color.green=(double)
-    virtual_pixel[GreenPixelChannel];
-  annotate_image->background_color.blue=(double)
-    virtual_pixel[BluePixelChannel];
-  annotate_image->background_color.alpha=(double)
-    virtual_pixel[AlphaPixelChannel];
+  (void) GetOneVirtualPixelInfo(image,UndefinedVirtualPixelMethod,(ssize_t) x,
+    (ssize_t) y,&annotate_image->background_color,exception);
   if (annotate_info->stencil == ForegroundStencil)
     annotate_image->matte=MagickTrue;
   annotate_view=AcquireCacheView(annotate_image);
@@ -2331,9 +2320,6 @@
   MagickBooleanType
     matte;
 
-  Quantum
-    virtual_pixel[CompositePixelChannel];
-
   Pixmap
     draw_pixmap;
 
@@ -2492,12 +2478,8 @@
   x=0;
   y=0;
   (void) XParseGeometry(draw_info->geometry,&x,&y,&width,&height);
-  (void) GetOneVirtualPixel(image,(ssize_t) x,(ssize_t) y,virtual_pixel,
-    exception);
-  draw_image->background_color.red=(double) virtual_pixel[RedPixelChannel];
-  draw_image->background_color.green=(double) virtual_pixel[GreenPixelChannel];
-  draw_image->background_color.blue=(double) virtual_pixel[BluePixelChannel];
-  draw_image->background_color.alpha=(double) virtual_pixel[AlphaPixelChannel];
+  (void) GetOneVirtualPixelInfo(image,UndefinedVirtualPixelMethod,(ssize_t) x,
+    (ssize_t) y,&draw_image->background_color,exception);
   if (SetImageStorageClass(draw_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   draw_image->matte=MagickTrue;