(no commit message)

[imagemagick] / magick / prepress.c

diff --git a/magick/prepress.c b/magick/prepress.c
index 1c842844dc2435ba8a0d86693c446f8435d41e4b..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  %
@@ -79,20 +79,20 @@
 */
 MagickExport double GetImageTotalInkDensity(Image *image)
 {
+  CacheView
+    *image_view;
+
   double
     total_ink_density;
 
   ExceptionInfo
     *exception;
 
-  long
-    y;
-
   MagickBooleanType
     status;
 
-  CacheView
-    *image_view;
+  ssize_t
+    y;
 
   assert(image != (Image *) NULL);
   if (image->debug != MagickFalse)
@@ -111,7 +111,7 @@ MagickExport double GetImageTotalInkDensity(Image *image)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(status)
 #endif
-  for (y=0; y < (long) image->rows; y++)
+  for (y=0; y < (ssize_t) image->rows; y++)
   {
     double
       density;
@@ -122,7 +122,7 @@ MagickExport double GetImageTotalInkDensity(Image *image)
     register const PixelPacket
       *p;
 
-    register long
+    register ssize_t
       x;
 
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
@@ -132,9 +132,10 @@ MagickExport double GetImageTotalInkDensity(Image *image)
         continue;
       }
     indexes=GetCacheViewVirtualIndexQueue(image_view);
-    for (x=0; x < (long) image->columns; x++)
+    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)