(no commit message)

[imagemagick] / utilities / import.c

diff --git a/utilities/import.c b/utilities/import.c
index f2faae3a5657b9c295ec37bf2a1522f7c1385909..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-2011 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  %
@@ -64,7 +64,7 @@
 %
 */
 
-int ImportMain(int argc,char **argv)
+static int ImportMain(int argc,char **argv)
 {
   ExceptionInfo
     *exception;
@@ -83,10 +83,10 @@ int ImportMain(int argc,char **argv)
   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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(ImportMain(argc,argv));
@@ -108,6 +108,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
+  return(status == MagickFalse ? 0 : 1);
 }
 #endif