(no commit message)

[imagemagick] / coders / hald.c

diff --git a/coders/hald.c b/coders/hald.c
index 47bc79a3449ac7797dc8413161bb8e07e5c4a62e..41eb89ec9add7f6b1f22750bf8009f890176c385 100644 (file)
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  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  %
@@ -92,9 +92,6 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
   Image
     *image;
 
-  long
-    y;
-
   MagickBooleanType
     status;
 
@@ -102,6 +99,9 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
     cube_size,
     level;
 
+  ssize_t
+    y;
+
   /*
     Create HALD color lookup table image.
   */
@@ -120,11 +120,11 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
     level=8;
   status=MagickTrue;
   cube_size=level*level;
-  image->columns=(unsigned long) (level*cube_size);
-  image->rows=(unsigned long) (level*cube_size);
-  for (y=0; y < (long) image->rows; y+=(long) level)
+  image->columns=(size_t) (level*cube_size);
+  image->rows=(size_t) (level*cube_size);
+  for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) level)
   {
-    long
+    ssize_t
       blue,
       green,
       red;
@@ -134,21 +134,24 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
 
     if (status == MagickFalse)
       continue;
-    q=QueueAuthenticPixels(image,0,y,image->columns,(unsigned long) level,
+    q=QueueAuthenticPixels(image,0,y,image->columns,(size_t) level,
       exception);
     if (q == (PixelPacket *) NULL)
       {
         status=MagickFalse;
         continue;
       }
-    blue=y/(long) level;
-    for (green=0; green < (long) cube_size; green++)
+    blue=y/(ssize_t) level;
+    for (green=0; green < (ssize_t) cube_size; green++)
     {
-      for (red=0; red < (long) cube_size; red++)
+      for (red=0; red < (ssize_t) cube_size; red++)
       {
-        q->red=ClampToQuantum(QuantumRange*red/(cube_size-1.0));
-        q->green=ClampToQuantum(QuantumRange*green/(cube_size-1.0));
-        q->blue=ClampToQuantum(QuantumRange*blue/(cube_size-1.0));
+        SetRedPixelComponent(q,ClampToQuantum(QuantumRange*red/
+          (cube_size-1.0)));
+        SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*green/
+          (cube_size-1.0)));
+        SetBluePixelComponent(q,ClampToQuantum(QuantumRange*blue/
+          (cube_size-1.0)));
         SetOpacityPixelComponent(q,OpaqueOpacity);
         q++;
       }
@@ -179,10 +182,10 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
 %
 %  The format of the RegisterHALDImage method is:
 %
-%      unsigned long RegisterHALDImage(void)
+%      size_t RegisterHALDImage(void)
 %
 */
-ModuleExport unsigned long RegisterHALDImage(void)
+ModuleExport size_t RegisterHALDImage(void)
 {
   MagickInfo
     *entry;
@@ -190,7 +193,7 @@ ModuleExport unsigned long RegisterHALDImage(void)
   entry=SetMagickInfo("HALD");
   entry->decoder=(DecodeImageHandler *) ReadHALDImage;
   entry->adjoin=MagickFalse;
-  entry->format_type=ExplicitFormatType;
+  entry->format_type=ImplicitFormatType;
   entry->raw=MagickTrue;
   entry->endian_support=MagickTrue;
   entry->description=ConstantString("Identity Hald color lookup table image");