From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 8 Apr 2014 07:35:08 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f95d7c1a1a4361a2cfa181c80eaa8dad189b3f81;p=imagemagick

---

diff --git a/MagickCore/config.h_vms b/MagickCore/config.h_vms
index 012e55fa9..d6a6ddd13 100644
--- 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 1567be199..22e372085 100644
--- 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 3d2f0332c..0ad52efef 100644
--- 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;