(no commit message)

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 4fa904e80fb14f3fadc63f5d2e00c6c9104f823b..3e2cfda11ae7b0b31695f518df8b77f2adf6f1b8 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -624,6 +624,9 @@ MagickExport LinkedListInfo *GetConfigureOptions(const char *filename,
 MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
   ExceptionInfo *exception)
 {
+#define MagickCoreDLL  "CORE_RL_MagickCore_.dll"
+#define MagickCoreDebugDLL  "CORE_DB_MagickCore_.dll"
+
   char
     path[MaxTextExtent];
 
@@ -667,8 +670,7 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
   }
 #if defined(MAGICKCORE_INSTALLED_SUPPORT)
 #if defined(MAGICKCORE_SHARE_PATH)
-  (void) AppendValueToLinkedList(paths,ConstantString(
-    MAGICKCORE_SHARE_PATH));
+  (void) AppendValueToLinkedList(paths,ConstantString(MAGICKCORE_SHARE_PATH));
 #endif
 #if defined(MAGICKCORE_CONFIGURE_PATH)
   (void) AppendValueToLinkedList(paths,ConstantString(
@@ -777,8 +779,8 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
     char
       module_path[MaxTextExtent];
 
-    if ((NTGetModulePath("CORE_RL_magick_.dll",module_path) != MagickFalse) ||
-        (NTGetModulePath("CORE_DB_magick_.dll",module_path) != MagickFalse))
+    if ((NTGetModulePath(MagickCoreDLL,module_path) != MagickFalse) ||
+        (NTGetModulePath(MagickCoreDebugDLL,module_path) != MagickFalse))
       {
         char
           *element;

diff --git a/coders/pango.c b/coders/pango.c
index c2b90082f116ae2c45a7d24a3951873bd4cb4016..56bfc441b02c5fbbd73578761af1d3c9f392cfcb 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -66,21 +66,13 @@
 #include <pango/pango.h>
 #endif
 \f
-/*
-  Forward declarations.
-*/
-#if defined(MAGICKCORE_PANGO_DELEGATE)
-static MagickBooleanType
-  WritePANGOImage(const ImageInfo *,Image *);
-#endif
-\f
 #if defined(MAGICKCORE_PANGO_DELEGATE)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   R e a d P A N G O I m a g e                                                 %
+%   R e a d P A N G O I m a g e                                               %
 %                                                                             %
 %                                                                             %
 %                                                                             %