...

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 1392ee262775180db16ac28958a498aad07f7916..8fb4d812436922850a7207435c46dbc0dd7ee36b 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -66,6 +66,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/MagickCore.h \
        MagickCore/accelerate.c \
        MagickCore/accelerate-private.h \
+       MagickCore/accelerate-kernels-private.h \
        MagickCore/animate.c \
        MagickCore/animate.h \
        MagickCore/animate-private.h \
@@ -408,6 +409,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 
 MAGICKCORE_NOINST_HDRS = \
        MagickCore/accelerate-private.h \
+       MagickCore/accelerate-kernels-private.h \
        MagickCore/animate-private.h \
        MagickCore/annotate-private.h \
        MagickCore/blob-private.h \

diff --git a/Makefile.in b/Makefile.in
index e92ef7f21fb84ac7f1e576670d16f79a5ba685a7..ace6a789600c9466175faea1056c34dc920b4ff8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -391,7 +391,8 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LINK =  \
 am__DEPENDENCIES_1 =
 am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES_DIST =  \
        MagickCore/MagickCore.h MagickCore/accelerate.c \
-       MagickCore/accelerate-private.h MagickCore/animate.c \
+       MagickCore/accelerate-private.h \
+       MagickCore/accelerate-kernels-private.h MagickCore/animate.c \
        MagickCore/animate.h MagickCore/animate-private.h \
        MagickCore/annotate.c MagickCore/annotate.h \
        MagickCore/artifact.c MagickCore/artifact.h \
@@ -4141,6 +4142,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/MagickCore.h \
        MagickCore/accelerate.c \
        MagickCore/accelerate-private.h \
+       MagickCore/accelerate-kernels-private.h \
        MagickCore/animate.c \
        MagickCore/animate.h \
        MagickCore/animate-private.h \
@@ -4478,6 +4480,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 
 MAGICKCORE_NOINST_HDRS = \
        MagickCore/accelerate-private.h \
+       MagickCore/accelerate-kernels-private.h \
        MagickCore/animate-private.h \
        MagickCore/annotate-private.h \
        MagickCore/blob-private.h \

diff --git a/coders/pcx.c b/coders/pcx.c
index 65f2328e0d99947e2aa86e3384f104d0e910b52b..4f3e8fef3397636999d2fd1acfc4a10c65a13453 100644 (file)
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -56,6 +56,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/pixel-accessor.h"

diff --git a/configure b/configure
index 184bcfda54be574eae06ee6cf4b68b099a58865c..e1eb07200747508cb3071e13246d401dc1d17800 100755 (executable)
--- a/configure
+++ b/configure
@@ -4515,7 +4515,7 @@ MAGICK_PATCHLEVEL_VERSION=7
 
 MAGICK_VERSION=7.0.1-7
 
-MAGICK_GIT_REVISION=18305:44fb54c:20160529
+MAGICK_GIT_REVISION=18306:4dec997:20160529
 
 
 # Substitute library versioning