...

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 656dad1998e4468377f2338635478a199206891c..600513143180249dc7b087889c506daee6cc233e 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -994,12 +994,14 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
   assert(exception != (ExceptionInfo *) NULL);
   sans_exception=AcquireExceptionInfo();
   write_info=CloneImageInfo(image_info);
-  (void) CopyMagickString(write_info->filename,image->filename,MagickPathExtent);
+  (void) CopyMagickString(write_info->filename,image->filename,
+    MagickPathExtent);
   (void) SetImageInfo(write_info,1,sans_exception);
   if (*write_info->magick == '\0')
     (void) CopyMagickString(write_info->magick,image->magick,MagickPathExtent);
   (void) CopyMagickString(filename,image->filename,MagickPathExtent);
-  (void) CopyMagickString(image->filename,write_info->filename,MagickPathExtent);
+  (void) CopyMagickString(image->filename,write_info->filename,
+    MagickPathExtent);
   domain=CoderPolicyDomain;
   rights=WritePolicyRights;
   if (IsRightsAuthorized(domain,rights,write_info->magick) == MagickFalse)
@@ -1134,7 +1136,8 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
                 magick_info=GetMagickInfo(extension,exception);
               else
                 magick_info=GetMagickInfo(image->magick,exception);
-              (void) CopyMagickString(image->filename,filename,MagickPathExtent);
+              (void) CopyMagickString(image->filename,filename,
+                MagickPathExtent);
             }
           if ((magick_info == (const MagickInfo *) NULL) ||
               (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 3c947a0c24e18855d76fb6c3140199bfcebaa6a1..7f4f2f7def1a2f903948272be4ec8bb00bb53254 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -264,6 +264,9 @@ extern "C" {
 #if !defined(unlink)
 #  define unlink  _unlink
 #endif
+#if !defined(utime)
+#  define utime  _utime
+#endif
 #if !defined(vfprintf_l)
 #define vfprintf_l  _vfprintf_l
 #endif

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 58e3b6ec4d925c59453759cfd447b074ae525a29..f143ce45a242022037790519a61344125c6ed523 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -168,7 +168,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT)
 # include <sys/types.h>
 # include <sys/stat.h>
-# if defined(MAGICKCORE_HAVE_FTIME)
+# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H)
 # include <sys/timeb.h>
 # endif
 # if defined(MAGICKCORE_POSIX_SUPPORT)

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index e7389f6c83cf44d73de7bbe6331fcb1ab953bfc6..75d4ec41f48aa346c1b441723bd03bf147b1f254 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1159,8 +1159,7 @@ MagickExport MagickBooleanType GetPathAttributes(const char *path,
       return(MagickFalse);
     }
   (void) ResetMagickMemory(attributes,0,sizeof(*attributes));
-  status=stat_utf8(path,attributes) == 0 ? MagickTrue :
-    MagickFalse;
+  status=stat_utf8(path,attributes) == 0 ? MagickTrue : MagickFalse;
   return(status);
 }
 \f

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 2540d3f792d57a52916d5619205cae859db5d929..61050649dd54438788d5a80f47fa524cf5924ad3 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -3939,8 +3939,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
         if (path != (char *) NULL)
           {
             GetPathComponent(option,TailPath,filename);
-            (void) FormatLocaleString(images->filename,MagickPathExtent,"%s%c%s",
-              path,*DirectorySeparator,filename);
+            (void) FormatLocaleString(images->filename,MagickPathExtent,
+              "%s%c%s",path,*DirectorySeparator,filename);
           }
         if (format != (char *) NULL)
           AppendImageFormat(format,images->filename);
@@ -3966,7 +3966,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               MagickPathExtent);
             for (j=0; j < 6; j++)
             {
-              (void) ConcatenateMagickString(backup_filename,"~",MagickPathExtent);
+              (void) ConcatenateMagickString(backup_filename,"~",
+                MagickPathExtent);
               if (IsPathAccessible(backup_filename) == MagickFalse)
                 break;
             }
@@ -4035,10 +4036,11 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,
+              argv[i]);
             if (type < 0)
-              ThrowMogrifyException(OptionError,"UnrecognizedAlphaChannelOption",
-                argv[i]);
+              ThrowMogrifyException(OptionError,
+                "UnrecognizedAlphaChannelOption",argv[i]);
             break;
           }
         if (LocaleCompare("alpha-color",option+1) == 0)
@@ -4637,7 +4639,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,
+              argv[i]);
             if (dispose < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -5501,7 +5504,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
                 ssize_t
                   noise;
 
-                noise=ParseCommandOption(MagickNoiseOptions,MagickFalse,argv[i]);
+                noise=ParseCommandOption(MagickNoiseOptions,MagickFalse,
+                  argv[i]);
                 if (noise < 0)
                   ThrowMogrifyException(OptionError,"UnrecognizedNoiseType",
                     argv[i]);
@@ -6124,7 +6128,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,argv[i]);
+            stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,
+              argv[i]);
             if (stretch < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedStyleType",
                 argv[i]);
@@ -8741,7 +8746,8 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
               *write_info;
 
             (void) SyncImagesSettings(mogrify_info,*images,exception);
-            (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",argv[i+1]);
+            (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",
+              argv[i+1]);
             (void) DeleteImageRegistry(key);
             write_images=(*images);
             if (*option == '+')

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 121605b503a0ff8d41cb880da6de08df14f2e819..d43a33829c2d7f7c6051e10059521b9a1e5fffec 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -169,7 +169,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #if defined(MAGICKWAND_WINDOWS_SUPPORT) || defined(MAGICKWAND_POSIX_SUPPORT)
 # include <sys/types.h>
 # include <sys/stat.h>
-# if defined(MAGICKCORE_HAVE_FTIME)
+# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H)
 # include <sys/timeb.h>
 # endif
 # if defined(MAGICKWAND_POSIX_SUPPORT)

diff --git a/config/config.h.in b/config/config.h.in
index 2ac161d526677c31a7a6b8c27ce9df34d8609baa..f8bced0306ba1eab2d8b14edadc6cbdf9f5377b7 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -637,6 +637,9 @@
 /* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
+/* Define to 1 if you have the <utime.h> header file. */
+#undef HAVE_UTIME_H
+
 /* Define to 1 if you have the `vfork' function. */
 #undef HAVE_VFORK
 

diff --git a/configure b/configure
index b431f166ed566350a070b83519ae1099feafcb2f..ddd4545543e0c590e5228c2493825d96260179ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=18000:b1b8626:20160409
+MAGICK_GIT_REVISION=18040:4a8f724:20160424
 
 
 # Substitute library versioning
@@ -24501,7 +24501,7 @@ fi
 
 
 # Check additional headers
-for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h
+for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h utime.h wchar.h xlocale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

diff --git a/configure.ac b/configure.ac
index 95a08152914f15139e3ef42554410d66ef49728e..1bff0f61c309c9a93ba64433e834e18fc6831039 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -930,7 +930,7 @@ AC_HEADER_ASSERT
 AC_HEADER_DIRENT
 
 # Check additional headers
-AC_CHECK_HEADERS(arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h)
+AC_CHECK_HEADERS(arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h utime.h wchar.h xlocale.h)
 
 ########
 #