commit b0af14f41c0cb866176f7a0931879afde6b890a7
author cristy <urban-warrior@git.imagemagick.org> Thu Sep 26 12:22:34 2013 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Sep 26 12:22:34 2013 +0000
tree 19bf9f8e92f1de69fe8a7304f166eccbdb97030a
parent 5ec25e291f1676589482637e3ded9b30a71898fc

coders/url.c

diff --git a/coders/url.c b/coders/url.c
index 8873b5c..8372dfd 100644
--- a/coders/url.c
+++ b/coders/url.c
@@ -70,9 +70,9 @@
 #  include <libxml/nanoftp.h>
 #  include <libxml/nanohttp.h>
 #endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \

-    !(defined(__MINGW32__) || defined(__MINGW64__))

-#  include <urlmon.h>

+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
+    !(defined(__MINGW32__) || defined(__MINGW64__))
+#  include <urlmon.h>
 #endif
 
 /*
@@ -173,17 +173,17 @@
       (void) CopyMagickString(read_info->filename,image_info->filename+2,
         MaxTextExtent);
     }
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \

-    !(defined(__MINGW32__) || defined(__MINGW64__))

-  (void) fclose(file);

-  if (URLDownloadToFile(NULL,filename,read_info->filename,NULL,NULL) != S_OK)

-    {

-      ThrowFileException(exception,FileOpenError,"UnableToOpenFile",

-        filename);

-      (void) RelinquishUniqueFileResource(read_info->filename);

-      read_info=DestroyImageInfo(read_info);

-      return((Image *) NULL);

-    }

+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
+    !(defined(__MINGW32__) || defined(__MINGW64__))
+  (void) fclose(file);
+  if (URLDownloadToFile(NULL,filename,read_info->filename,NULL,NULL) != S_OK)
+    {
+      ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
+        filename);
+      (void) RelinquishUniqueFileResource(read_info->filename);
+      read_info=DestroyImageInfo(read_info);
+      return((Image *) NULL);
+    }
 #else
 #if defined(MAGICKCORE_XML_DELEGATE) && defined(LIBXML_FTP_ENABLED)
   if (LocaleCompare(read_info->magick,"ftp") == 0)
@@ -295,8 +295,8 @@
     *entry;
 
   entry=SetMagickInfo("HTTP");
-#if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \

-    !(defined(__MINGW32__) || defined(__MINGW64__))) || \

+#if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \
+    !(defined(__MINGW32__) || defined(__MINGW64__))) || \
     (defined(MAGICKCORE_XML_DELEGATE) && defined(LIBXML_HTTP_ENABLED))
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
 #endif
@@ -304,18 +304,18 @@
   entry->module=ConstantString("URL");
   entry->stealth=MagickTrue;
   (void) RegisterMagickInfo(entry);
-  entry=SetMagickInfo("HTTPS");

-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \

-    !(defined(__MINGW32__) || defined(__MINGW64__))

-  entry->decoder=(DecodeImageHandler *) ReadURLImage;

-#endif

-  entry->description=ConstantString("Uniform Resource Locator (https://)");

-  entry->module=ConstantString("URL");

-  entry->stealth=MagickTrue;

+  entry=SetMagickInfo("HTTPS");
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
+    !(defined(__MINGW32__) || defined(__MINGW64__))
+  entry->decoder=(DecodeImageHandler *) ReadURLImage;
+#endif
+  entry->description=ConstantString("Uniform Resource Locator (https://)");
+  entry->module=ConstantString("URL");
+  entry->stealth=MagickTrue;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("FTP");
-#if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \

-    !(defined(__MINGW32__) || defined(__MINGW64__))) || \

+#if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \
+    !(defined(__MINGW32__) || defined(__MINGW64__))) || \
     (defined(MAGICKCORE_XML_DELEGATE) && defined(LIBXML_FTP_ENABLED))
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
 #endif