(no commit message)

[imagemagick] / coders / xc.c

diff --git a/coders/xc.c b/coders/xc.c
index 7cd4c03df1fb9ea03907c8c06db735f6eadb7e3d..60992f71a412ca7618f172e241ac85d75684f61a 100644 (file)
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -102,13 +102,13 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   MagickPixelPacket
     color;
 
-  long
+  ssize_t
     y;
 
   PixelPacket
     pixel;
 
-  register long
+  register ssize_t
     x;
 
   register PixelPacket
@@ -140,17 +140,17 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->matte=color.matte;
   index=0;
   SetPixelPacket(image,&color,&pixel,&index);
-  for (y=0; y < (long) image->rows; y++)
+  for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
       break;
-    for (x=0; x < (long) image->columns; x++)
+    for (x=0; x < (ssize_t) image->columns; x++)
       *q++=pixel;
     if (image->colorspace == CMYKColorspace)
       {
         indexes=GetAuthenticIndexQueue(image);
-        for (x=0; x < (long) image->columns; x++)
+        for (x=0; x < (ssize_t) image->columns; x++)
           indexes[x]=index;
       }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -179,10 +179,10 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
 %
 %  The format of the RegisterXCImage method is:
 %
-%      unsigned long RegisterXCImage(void)
+%      size_t RegisterXCImage(void)
 %
 */
-ModuleExport unsigned long RegisterXCImage(void)
+ModuleExport size_t RegisterXCImage(void)
 {
   MagickInfo
     *entry;
@@ -190,7 +190,16 @@ ModuleExport unsigned long RegisterXCImage(void)
   entry=SetMagickInfo("XC");
   entry->decoder=(DecodeImageHandler *) ReadXCImage;
   entry->adjoin=MagickFalse;
-  entry->format_type=ExplicitFormatType;
+  entry->format_type=ImplicitFormatType;
+  entry->raw=MagickTrue;
+  entry->endian_support=MagickTrue;
+  entry->description=ConstantString("Constant image uniform color");
+  entry->module=ConstantString("XC");
+  (void) RegisterMagickInfo(entry);
+  entry=SetMagickInfo("CANVAS");
+  entry->decoder=(DecodeImageHandler *) ReadXCImage;
+  entry->adjoin=MagickFalse;
+  entry->format_type=ImplicitFormatType;
   entry->raw=MagickTrue;
   entry->endian_support=MagickTrue;
   entry->description=ConstantString("Constant image uniform color");
@@ -220,5 +229,6 @@ ModuleExport unsigned long RegisterXCImage(void)
 */
 ModuleExport void UnregisterXCImage(void)
 {
+  (void) UnregisterMagickInfo("CANVAS");
   (void) UnregisterMagickInfo("XC");
 }