(no commit message)

[imagemagick] / magick / prepress.c

diff --git a/magick/prepress.c b/magick/prepress.c
index 4cd87f17f768d902cdbb923e5080023cab57574d..21c0585d20785fbd0a693d3a9d36d8901998ec82 100644 (file)
--- a/magick/prepress.c
+++ b/magick/prepress.c
@@ -17,7 +17,7 @@
 %                                October 2001                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  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.  You may  %
@@ -88,12 +88,12 @@ MagickExport double GetImageTotalInkDensity(Image *image)
   ExceptionInfo
     *exception;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
+  ssize_t
+    y;
+
   assert(image != (Image *) NULL);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -134,7 +134,8 @@ MagickExport double GetImageTotalInkDensity(Image *image)
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      density=(double) p->red+p->green+p->blue+indexes[x];
+      density=(double) GetRedPixelComponent(p)+GetGreenPixelComponent(p)+
+        GetBluePixelComponent(p)+GetIndexPixelComponent(indexes+x);
       if (density > total_ink_density)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetImageTotalInkDensity)