(no commit message)

[imagemagick] / coders / url.c

diff --git a/coders/url.c b/coders/url.c
index 2962b1d060a87f0ef065bc297c3436c37fbb4965..5991e5461e2300a2f4fcb400237c5db14c121ee6 100644 (file)
--- a/coders/url.c
+++ b/coders/url.c
@@ -40,22 +40,23 @@
 /*
   Include declarations.
 */
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
 #    if defined(__MINGW32__)
@@ -116,6 +117,7 @@ static void GetFTPData(void *userdata,const char *data,int size)
   if (size <= 0)
     return;
   length=fwrite(data,size,1,file);
+  (void) length;
 }
 #endif
 
@@ -210,6 +212,7 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           while ((bytes=xmlNanoHTTPRead(context,buffer,MaxBufferExtent)) > 0)
             count=(ssize_t) fwrite(buffer,bytes,1,file);
+          (void) count;
           xmlNanoHTTPClose(context);
           xmlFree(type);
           xmlNanoHTTPCleanup();
@@ -222,7 +225,9 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if (unique_file != -1)
     (void) RelinquishUniqueFileResource(read_info->filename);
   read_info=DestroyImageInfo(read_info);
-  if (image == (Image *) NULL)
+  if (image != (Image *) NULL)
+    GetPathComponent(image_info->filename,TailPath,image->filename);
+  else
     (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
       "NoDataReturned","`%s'",filename);
   return(GetFirstImageInList(image));