(no commit message)

[imagemagick] / utilities / import.c

diff --git a/utilities/import.c b/utilities/import.c
index c5d0c7fe1a074a2de6fcd7a3510b3d713c29d650..854dc38e77f5017e7574c84fee69aa18f3e5dba4 100644 (file)
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -13,11 +13,11 @@
 %               Import image to a machine independent format.                 %
 %                                                                             %
 %                           Software Design                                   %
-%                             John Cristy                                     %
+%                                Cristy                                       %
 %                              July 1992                                      %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -47,8 +47,8 @@
 /*
   Include declarations.
 */
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64,26 +64,8 @@
 %
 */
 
-#if defined(__WINDOWS__)
-int WINAPI WinMain(HINSTANCE instance,HINSTANCE last,LPSTR command,int state)
+static int ImportMain(int argc,char **argv)
 {
-  char
-    **argv;
-
-  int
-    argc,
-    main(int,char **);
-
-  argv=StringToArgv(command,&argc);
-  return(main(argc,argv));
-}
-#endif
-
-int main(int argc,char **argv)
-{
-  char
-    *metadata;
-
   ExceptionInfo
     *exception;
 
@@ -96,13 +78,36 @@ int main(int argc,char **argv)
   MagickCoreGenesis(*argv,MagickTrue);
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
-  metadata=(char *) NULL;
   status=MagickCommandGenesis(image_info,ImportImageCommand,argc,argv,
-    &metadata,exception);
-  if (metadata != (char *) NULL)
-    metadata=DestroyString(metadata);
+    (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status);
+  return(status == MagickFalse ? 0 : 1);
+}
+
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+int main(int argc,char **argv)
+{
+  return(ImportMain(argc,argv));
+}
+#else
+int wmain(int argc,wchar_t *argv[])
+{
+  char
+    **utf8;
+
+  int
+    status;
+
+  register int
+    i;
+
+  utf8=NTArgvToUTF8(argc,argv);
+  status=ImportMain(argc,utf8);
+  for (i=0; i < argc; i++)
+    utf8[i]=DestroyString(utf8[i]);
+  utf8=(char **) RelinquishMagickMemory(utf8);
+  return(status == MagickFalse ? 0 : 1);
 }
+#endif