Make MagicInfo an opaque type.

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 6c607bd40422089cac0e27bbc0d6d038f9943c99..8b65d5efa68cd731e62783be53a7484af7d92e80 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -82,6 +82,30 @@ typedef struct _MagicMapInfo
   const size_t
     length;
 } MagicMapInfo;
+
+struct _MagicInfo
+{
+  char
+    *path,
+    *name,
+    *target;
+
+  unsigned char
+    *magic;
+
+  size_t
+    length;
+
+  MagickOffsetType
+    offset;
+
+  MagickBooleanType
+    exempt,
+    stealth;
+
+  size_t
+    signature;
+};
 \f
 /*
   Static declarations.

diff --git a/MagickCore/magic.h b/MagickCore/magic.h
index e4ef371952e4780c64199c60087710b882884323..3db829f57b54c48da16a0c9a25504301f8ac8aa9 100644 (file)
--- a/MagickCore/magic.h
+++ b/MagickCore/magic.h
@@ -23,28 +23,7 @@ extern "C" {
 #endif
 
 typedef struct _MagicInfo
-{
-  char
-    *path,
-    *name,
-    *target;
-
-  unsigned char
-    *magic;
-
-  size_t
-    length;
-
-  MagickOffsetType
-    offset;
-
-  MagickBooleanType
-    exempt,
-    stealth;
-
-  size_t
-    signature;
-} MagicInfo;
+  MagicInfo;
 
 extern MagickExport char
   **GetMagicList(const char *,size_t *,ExceptionInfo *);

diff --git a/coders/wpg.c b/coders/wpg.c
index 2f3f7a871bda40eebfa8e4a292f2fa799d9a106d..24ebf9af368a8a2a5738486f10bc52b0365c6b45 100644 (file)
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -834,8 +834,8 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info,
   if(magic_info == (const MagicInfo *) NULL) goto FINISH_UNL;
   /*     printf("Detected:%s  \n",magic_info->name); */
   if(exception->severity != UndefinedException) goto FINISH_UNL;
-  if(magic_info->name == (char *) NULL) goto FINISH_UNL;
-  (void) strncpy(clone_info->magick,magic_info->name,MagickPathExtent-1);
+  (void) strncpy(clone_info->magick,GetMagicName(magic_info),
+    MagickPathExtent-1);
   if (LocaleCompare(clone_info->magick,"PFB") != 0)
     {      
       ThrowException(exception,CorruptImageError,"ImproperImageHeader",