commit 06b627a07ff44e1ff93ef1288c9f428066ded10d
author dirk <dirk@git.imagemagick.org> Mon Apr 06 18:59:17 2015 +0000
committer dirk <dirk@git.imagemagick.org> Mon Apr 06 18:59:17 2015 +0000
tree c260e282a25f31e1eeebdd39fd885e2e2aefb151
parent e848b9adecc9fb64683c77ca01739c4e8017a3ff

Renamed SetMagickInfo to AcquireMagickInfo and made the module and description mandatory.
Changed RegisterMagickInfo to return a boolean instead of the supplied pointer.

coders/jpeg.c

diff --git a/coders/jpeg.c b/coders/jpeg.c
index ea86abd..cab17ad 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1513,20 +1513,19 @@
 */
 ModuleExport size_t RegisterJPEGImage(void)
 {
+#define JPEGDescription "Joint Photographic Experts Group JFIF format"
+
   char
     version[MaxTextExtent];
 
   MagickInfo
     *entry;
 
-  static const char
-    description[] = "Joint Photographic Experts Group JFIF format";
-
   *version='\0';
 #if defined(JPEG_LIB_VERSION)
   (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
 #endif
-  entry=SetMagickInfo("JPE");
+  entry=AcquireMagickInfo("JPEG","JPE",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
@@ -1537,13 +1536,11 @@
   entry->magick=(IsImageFormatHandler *) IsJPEG;
   entry->flags^=CoderAdjoinFlag;
   entry->flags^=CoderUseExtensionFlag;
-  entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->mime_type=ConstantString("image/jpeg");
-  entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("JPEG");
+  entry=AcquireMagickInfo("JPEG","JPEG",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
@@ -1553,13 +1550,11 @@
 #endif
   entry->magick=(IsImageFormatHandler *) IsJPEG;
   entry->flags^=CoderAdjoinFlag;
-  entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->mime_type=ConstantString("image/jpeg");
-  entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("JPG");
+  entry=AcquireMagickInfo("JPEG","JPG",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
@@ -1569,13 +1564,11 @@
 #endif
   entry->flags^=CoderAdjoinFlag;
   entry->flags^=CoderUseExtensionFlag;
-  entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->mime_type=ConstantString("image/jpeg");
-  entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("JPS");
+  entry=AcquireMagickInfo("JPEG","JPS",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
@@ -1585,13 +1578,11 @@
 #endif
   entry->flags^=CoderAdjoinFlag;
   entry->flags^=CoderUseExtensionFlag;
-  entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->mime_type=ConstantString("image/jpeg");
-  entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("PJPEG");
+  entry=AcquireMagickInfo("JPEG","PJPEG",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
@@ -1601,11 +1592,9 @@
 #endif
   entry->flags^=CoderAdjoinFlag;
   entry->flags^=CoderUseExtensionFlag;
-  entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->mime_type=ConstantString("image/jpeg");
-  entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }