(no commit message)

diff --git a/MagickCore/config.h_vms b/MagickCore/config.h_vms
index 012e55fa91b242e55a18a5b8f835f20a4f570e64..d6a6ddd1333101f142188f79663c6d0bfe814efb 100644 (file)
--- a/MagickCore/config.h_vms
+++ b/MagickCore/config.h_vms
@@ -212,7 +212,7 @@
 #define MAGICKCORE_JPEG_DELEGATE 1
 
 /* Define if you have JPEG version 2 Jasper library */
-#define MAGICKCORE_JP2_DELEGATE 1
+#define MAGICKCORE_LIBOPENJP2_DELEGATE 1
 
 /* Define if you have Ghostscript library */
 #undef MAGICKCORE_GS_DELEGATE

diff --git a/MagickCore/version.c b/MagickCore/version.c
index 1567be199a07bb106a19cf81c0c1318864aafa27..22e37208571b428de28bac4d41ee5c0a95e0b3ff 100644 (file)
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -142,7 +142,7 @@ MagickExport const char *GetMagickDelegates(void)
 #if defined(MAGICKCORE_JPEG_DELEGATE) && defined(MAGICKCORE_PNG_DELEGATE)
   "jng "
 #endif
-#if defined(MAGICKCORE_JP2_DELEGATE)
+#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   "jp2 "
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)

diff --git a/coders/pdf.c b/coders/pdf.c
index 3d2f0332ce50e9ada10eab6b7d9fe809bc92b309..0ad52efef3a38fc0f43da64a03056b7f5dca3cd4 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1274,7 +1274,7 @@ RestoreMSCWarning
         break;
       }
 #endif
-#if !defined(MAGICKCORE_JP2_DELEGATE)
+#if !defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
       case JPEG2000Compression:
       {
         compression=RLECompression;