...

[imagemagick] / coders / xtrn.c

diff --git a/coders/xtrn.c b/coders/xtrn.c
index d11c006d4d6e015f08a90aedc2038c24875c4523..1a834211aa9b18926491f5e38187cb6b51469bae 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -17,13 +17,13 @@
 %                                 May 2001                                    %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2018 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  %
 %  obtain a copy of the License at                                            %
 %                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
+%    https://www.imagemagick.org/script/license.php                           %
 %                                                                             %
 %  Unless required by applicable law or agreed to in writing, software        %
 %  distributed under the License is distributed on an "AS IS" BASIS,          %
@@ -58,7 +58,7 @@
 #include "MagickCore/MagickCore.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/string_.h"
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
 #include <windows.h>
@@ -98,7 +98,7 @@ static MagickBooleanType
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 static Image *ReadXTRNImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
 {
@@ -200,7 +200,7 @@ ModuleExport size_t RegisterXTRNImage(void)
 
   entry=AcquireMagickInfo("XTRN","XTRNARRAY",
     "External transfer via a smart array interface");
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
@@ -264,7 +264,7 @@ ModuleExport void UnregisterXTRNImage(void)
 %
 */
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 static size_t SafeArrayFifo(const Image *image,const void *data,
   const size_t length)
 {
@@ -307,10 +307,7 @@ static size_t SafeArrayFifo(const Image *image,const void *data,
   }
   return(tlen);
 }
-#endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#  pragma warning(disable : 4477)
 static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
   Image *image,ExceptionInfo *exception)
 {
@@ -368,5 +365,4 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
   clone_info=DestroyImageInfo(clone_info);
   return(MagickTrue);
 }
-#  pragma warning(default : 4477)
 #endif