(no commit message)

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index cf3b772e2d12295a0da06c0c93bb3e86986b947d..b7ddb6727088fdd34174d38a8bef9b95f0afcbd7 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -245,7 +245,7 @@ extern MagickPrivate const void
 
 extern MagickPrivate MagickBooleanType
   CacheComponentGenesis(void),
-  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *)
+  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *restrict,ExceptionInfo *)
     magick_hot_spot,
   SyncImagePixelCache(Image *,ExceptionInfo *);
 

diff --git a/MagickCore/cache-view.h b/MagickCore/cache-view.h
index a6d84cc7f645854c9dc027f0580b7c98ee985c43..1d2da48730fe334d4ffab85d570ec7664b2d7737 100644 (file)
--- a/MagickCore/cache-view.h
+++ b/MagickCore/cache-view.h
@@ -72,17 +72,18 @@ extern MagickExport const void
   *GetCacheViewVirtualMetacontent(const CacheView *);
 
 extern MagickExport MagickBooleanType
-  GetOneCacheViewAuthenticPixel(const CacheView *,const ssize_t,const ssize_t,
-    Quantum *,ExceptionInfo *),
+  GetOneCacheViewAuthenticPixel(const CacheView *restrict,const ssize_t,
+    const ssize_t,Quantum *restrict,ExceptionInfo *),
   GetOneCacheViewVirtualMethodPixel(const CacheView *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,Quantum *,ExceptionInfo *),
-  GetOneCacheViewVirtualPixel(const CacheView *,const ssize_t,const ssize_t,
-    Quantum *,ExceptionInfo *),
+  GetOneCacheViewVirtualPixel(const CacheView *restrict,const ssize_t,
+    const ssize_t,Quantum *restrict,ExceptionInfo *),
   GetOneCacheViewVirtualPixelInfo(const CacheView *,const ssize_t,const ssize_t,
     PixelInfo *,ExceptionInfo *),
   SetCacheViewStorageClass(CacheView *,const ClassType,ExceptionInfo *),
-  SetCacheViewVirtualPixelMethod(CacheView *,const VirtualPixelMethod),
-  SyncCacheViewAuthenticPixels(CacheView *,ExceptionInfo *) magick_hot_spot;
+  SetCacheViewVirtualPixelMethod(CacheView *restrict,const VirtualPixelMethod),
+  SyncCacheViewAuthenticPixels(CacheView *restrict,ExceptionInfo *)
+    magick_hot_spot;
 
 extern MagickExport MagickSizeType
   GetCacheViewExtent(const CacheView *);

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 423ca9b9515e5a6f101ada9039e7f1f4585e06e3..56bffc805f9c2adb3205198620f40c23b88ea4b1 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -119,11 +119,12 @@ static MagickBooleanType
   GetOneVirtualPixelFromCache(const Image *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,Quantum *,ExceptionInfo *),
   OpenPixelCache(Image *,const MapMode,ExceptionInfo *),
-  ReadPixelCachePixels(CacheInfo *,NexusInfo *,ExceptionInfo *),
-  ReadPixelCacheMetacontent(CacheInfo *,NexusInfo *,ExceptionInfo *),
+  ReadPixelCachePixels(CacheInfo *restrict,NexusInfo *restrict,ExceptionInfo *),
+  ReadPixelCacheMetacontent(CacheInfo *restrict,NexusInfo *restrict,
+    ExceptionInfo *),
   SyncAuthenticPixelsCache(Image *,ExceptionInfo *),
-  WritePixelCachePixels(CacheInfo *,NexusInfo *,ExceptionInfo *),
-  WritePixelCacheMetacontent(CacheInfo *,NexusInfo *,ExceptionInfo *);
+  WritePixelCachePixels(CacheInfo *,NexusInfo *restrict,ExceptionInfo *),
+  WritePixelCacheMetacontent(CacheInfo *,NexusInfo *restrict,ExceptionInfo *);
 
 static Quantum
   *GetAuthenticPixelsCache(Image *,const ssize_t,const ssize_t,const size_t,

diff --git a/MagickCore/compress.h b/MagickCore/compress.h
index 583b461933c22ee41640e45f467d0d0589647405..3320bf0f18ed2fede4c79685a9b22501719a3006 100644 (file)
--- a/MagickCore/compress.h
+++ b/MagickCore/compress.h
@@ -54,9 +54,10 @@ typedef struct _Ascii85Info
 extern MagickExport MagickBooleanType
   HuffmanDecodeImage(Image *,ExceptionInfo *),
   HuffmanEncodeImage(const ImageInfo *,Image *,Image *,ExceptionInfo *),
-  LZWEncodeImage(Image *,const size_t,unsigned char *,ExceptionInfo *),
-  PackbitsEncodeImage(Image *,const size_t,unsigned char *,ExceptionInfo *),
-  ZLIBEncodeImage(Image *,const size_t,unsigned char *,ExceptionInfo *);
+  LZWEncodeImage(Image *,const size_t,unsigned char *restrict,ExceptionInfo *),
+  PackbitsEncodeImage(Image *,const size_t,unsigned char *restrict,
+    ExceptionInfo *),
+  ZLIBEncodeImage(Image *,const size_t,unsigned char *restrict,ExceptionInfo *);
 
 extern MagickExport void
   Ascii85Encode(Image *,const unsigned char),

diff --git a/MagickCore/distribute-cache-private.h b/MagickCore/distribute-cache-private.h
index 33827e89ac1abd23df2e3540bc6bd5801a6d9e3e..9325c3441211f2b383f76d9209627170b1766a7a 100644 (file)
--- a/MagickCore/distribute-cache-private.h
+++ b/MagickCore/distribute-cache-private.h
@@ -65,11 +65,11 @@ extern MagickPrivate MagickOffsetType
   ReadDistributePixelCacheMetacontent(DistributeCacheInfo *,
     const RectangleInfo *,const MagickSizeType,unsigned char *),
   ReadDistributePixelCachePixels(DistributeCacheInfo *,const RectangleInfo *,
-    const MagickSizeType,unsigned char *),
+    const MagickSizeType,unsigned char *restrict),
   WriteDistributePixelCacheMetacontent(DistributeCacheInfo *,
     const RectangleInfo *,const MagickSizeType,const unsigned char *),
   WriteDistributePixelCachePixels(DistributeCacheInfo *,const RectangleInfo *,
-    const MagickSizeType,const unsigned char *);
+    const MagickSizeType,const unsigned char *restrict);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 9aebafa7d8d11e8c2b267e9e10a797f5cd2450d9..4bd3feaeecfddebec2f83a55be953f3e0aedb8fd 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -620,6 +620,11 @@
 #define MAGICKCORE_HAVE_SELECT 1
 #endif
 
+/* Define to 1 if you have the `sendfile' function. */
+#ifndef MAGICKCORE_HAVE_SENDFILE
+#define MAGICKCORE_HAVE_SENDFILE 1
+#endif
+
 /* Define to 1 if you have the `setlocale' function. */
 #ifndef MAGICKCORE_HAVE_SETLOCALE
 #define MAGICKCORE_HAVE_SETLOCALE 1

diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index ffefd603f1a80601f8aa1fe737aaafe368ca777b..77ebe8107426736743fbad75626fdfddec2a2611 100644 (file)
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -170,10 +170,10 @@ extern MagickExport QuantumType
 
 extern MagickExport size_t
   ExportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType,
-    unsigned char *,ExceptionInfo *),
+    unsigned char *restrict,ExceptionInfo *),
   GetQuantumExtent(const Image *,const QuantumInfo *,const QuantumType),
   ImportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType,
-    const unsigned char *,ExceptionInfo *);
+    const unsigned char *restrict,ExceptionInfo *);
 
 extern MagickExport void
   GetQuantumInfo(const ImageInfo *,QuantumInfo *),

diff --git a/MagickCore/version.h b/MagickCore/version.h
index f5221f15c03fcb7ed327b53889f6fe3c1d630385..5b97bfc0c2772707711eb21e862b147087a3a106 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision  "18670M"
+#define MagickSVNRevision  "18670:18677M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  0,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  0
 #define MagickppLibMinInterface  0
-#define MagickReleaseDate  "2015-05-29"
+#define MagickReleaseDate  "2015-05-30"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \
   "http://www.imagemagick.org/script/license.php"

diff --git a/config/config.h.in b/config/config.h.in
index a07feffadf9524bfbb8741e4e95774ac2fc21c6d..97c28883e800b9221253e2f9ac67ee077a3e1cb3 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -405,6 +405,9 @@
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
+/* Define to 1 if you have the `sendfile' function. */
+#undef HAVE_SENDFILE
+
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 

diff --git a/configure b/configure
index 7633dd204c3e4e85fbf67758e28fe916fd3bb5ed..1b2fe7ea146eff773048f75131c0ebe76d9bfba0 100755 (executable)
--- a/configure
+++ b/configure
@@ -4341,7 +4341,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18670M
+MAGICK_SVN_REVISION=18670:18677M
 
 
 # Substitute library versioning
@@ -25719,7 +25719,7 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 fi
 
 
-for ac_func in acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat
+for ac_func in acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

diff --git a/configure.ac b/configure.ac
index ba0e1118628282b0b04bd5dc09f44ecce3b2f7cd..5d74c1dbbcf68523c84f353a56f4efff9fed7eb6 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1198,7 +1198,7 @@ AC_SEARCH_LIBS(socket, socket,
   MAGICK_FEATURES="DPC $MAGICK_FEATURES"
 ])
 
-AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
 
 #
 # Check for clock_gettime().