(no commit message)

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index ada00f800c7ab2ac5654a40a858fa5c9398fae21..3bb5a28ace02b4db04b263cea8cf612a351e96a4 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -149,6 +149,7 @@ typedef struct _MagickWand
 #include "MagickWand/drawing-wand.h"
 #include "MagickWand/identify.h"
 #include "MagickWand/import.h"
+#include "MagickWand/magick-cli.h"
 #include "MagickWand/magick-property.h"
 #include "MagickWand/magick-image.h"
 #include "MagickWand/mogrify.h"

diff --git a/utilities/magick.c b/utilities/magick.c
index a1618b3e5df1ce066d74d77457863b8e1a2a5b15..90cf5d1ab4fb35890e3b6086731b71254ae6380b 100644 (file)
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -82,7 +82,7 @@ static int MagickMain(int argc,char **argv)
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 int main(int argc,char **argv)
 {
-  return(ConvertMain(argc,argv));
+  return(MagickMain(argc,argv));
 }
 #else
 int wmain(int argc,wchar_t *argv[])
@@ -97,7 +97,7 @@ int wmain(int argc,wchar_t *argv[])
     i;
 
   utf8=NTArgvToUTF8(argc,argv);
-  status=ConvertMain(argc,utf8);
+  status=MagickMain(argc,utf8);
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);