From 6c28ec0eb2db8a0f8417e7b393fbbf7bb7c5da94 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 28 Oct 2011 11:37:57 +0000 Subject: [PATCH] --- MagickCore/configure.c | 10 ++++++---- coders/pango.c | 10 +--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/MagickCore/configure.c b/MagickCore/configure.c index 4fa904e80..3e2cfda11 100644 --- 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 c2b90082f..56bfc441b 100644 --- a/coders/pango.c +++ b/coders/pango.c @@ -66,21 +66,13 @@ #include #endif -/* - Forward declarations. -*/ -#if defined(MAGICKCORE_PANGO_DELEGATE) -static MagickBooleanType - WritePANGOImage(const ImageInfo *,Image *); -#endif - #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 % % % % % % % -- 2.40.0