From 4bb3ba9fd39af54bcb6f08b3e5a170eccdfb6fa9 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 24 Apr 2016 14:28:07 -0400 Subject: [PATCH] ... --- MagickCore/constitute.c | 9 ++++++--- MagickCore/nt-base.h | 3 +++ MagickCore/studio.h | 2 +- MagickCore/utility.c | 3 +-- MagickWand/mogrify.c | 26 ++++++++++++++++---------- MagickWand/studio.h | 2 +- config/config.h.in | 3 +++ configure | 4 ++-- configure.ac | 2 +- 9 files changed, 34 insertions(+), 20 deletions(-) diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index 656dad199..600513143 100644 --- 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 3c947a0c2..7f4f2f7de 100644 --- 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 58e3b6ec4..f143ce45a 100644 --- 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 # include -# if defined(MAGICKCORE_HAVE_FTIME) +# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H) # include # endif # if defined(MAGICKCORE_POSIX_SUPPORT) diff --git a/MagickCore/utility.c b/MagickCore/utility.c index e7389f6c8..75d4ec41f 100644 --- 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); } diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 2540d3f79..61050649d 100644 --- 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 121605b50..d43a33829 100644 --- 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 # include -# if defined(MAGICKCORE_HAVE_FTIME) +# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H) # include # endif # if defined(MAGICKWAND_POSIX_SUPPORT) diff --git a/config/config.h.in b/config/config.h.in index 2ac161d52..f8bced030 100644 --- 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 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 b431f166e..ddd454554 100755 --- 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 95a081529..1bff0f61c 100644 --- 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) ######## # -- 2.49.0