Renamed SetMagickInfo to AcquireMagickInfo and made the module and description mandatory.

Changed RegisterMagickInfo to return a boolean instead of the supplied pointer.

1 files changed, 7 insertions, 21 deletions

diff --git a/coders/magick.c b/coders/magick.c
index e3e8fe6fe..b7b6b64ed 100644
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -13099,61 +13099,47 @@ ModuleExport size_t RegisterMAGICKImage(void)
   MagickInfo
     *entry;
 
-  entry=SetMagickInfo("GRANITE");
+  entry=AcquireMagickInfo("MAGICK","GRANITE","Granite texture");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("Granite texture");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("H");
+  entry=AcquireMagickInfo("MAGICK","H","Internal format");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("Internal format");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("LOGO");
+  entry=AcquireMagickInfo("MAGICK","LOGO","ImageMagick Logo");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("ImageMagick Logo");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("MAGICK");
+  entry=AcquireMagickInfo("MAGICK","MAGICK","Predefined Magick Image");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("Predefined Magick Image");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("NETSCAPE");
+  entry=AcquireMagickInfo("MAGICK","NETSCAPE","Netscape 216 color cube");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("Netscape 216 color cube");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("ROSE");
+  entry=AcquireMagickInfo("MAGICK","ROSE","70x46 Truecolor rose");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("70x46 Truecolor rose");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("WIZARD");
+  entry=AcquireMagickInfo("MAGICK","WIZARD","ImageMagick Wizard");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderStealthFlag;
-  entry->description=ConstantString("ImageMagick Wizard");
-  entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }