git-svn-id:...

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@862 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74

git-svn-id:...
git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@862 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
e73bb338 · cristy · 15de3b60 · e73bb338 · e73bb338 · e73bb338
Commit e73bb338 authored Jan 04, 2010 by cristy
18 changed files
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -159,7 +159,7 @@ MAGICKPP_INCHEADERS_OPT = \
 	Magick++/lib/Magick++/STL.h \
 	Magick++/lib/Magick++/TypeMetric.h

-Magick___lib_libMagick___la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
 	-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)


--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ TEST_EXTENSIONS = .sh

 # Tests to run
 TESTS = \
+	$(PERLMAGICK_TESTS) \
 	$(TESTS_TESTS) \
 	$(MAGICKPP_TESTS) \
 	$(WAND_TESTS) \

--- a/Makefile.in
+++ b/Makefile.in
@@ -215,7 +215,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(TESTS_TESTS) $(am__EXEEXT_6) $(WAND_TESTS)
+TESTS = $(PERLMAGICK_TESTS) $(TESTS_TESTS) $(am__EXEEXT_6) \
+	$(WAND_TESTS)
 XFAIL_TESTS = $(am__EXEEXT_7) $(am__EXEEXT_7)
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_5)
 DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \
@@ -2322,7 +2323,6 @@ LPDelegate = @LPDelegate@
 LPRDelegate = @LPRDelegate@
 LQR_CFLAGS = @LQR_CFLAGS@
 LQR_LIBS = @LQR_LIBS@
-LTCXXLIBOPTS = @LTCXXLIBOPTS@
 LTDLDEPS = @LTDLDEPS@
 LTDLINCL = @LTDLINCL@
 LTDLOPEN = @LTDLOPEN@
@@ -4348,7 +4348,7 @@ MAGICKPP_INCHEADERS_OPT = \
 	Magick++/lib/Magick++/STL.h \
 	Magick++/lib/Magick++/TypeMetric.h

-Magick___lib_libMagick___la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
 	-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)

 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
@@ -10994,7 +10994,7 @@ perl-sources:
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"

 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE)
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test

 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
@@ -11025,7 +11025,7 @@ perl-sources:
 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	rm -f '$(DESTDIR)$(BIN_DIR)/$(PERLSTATICNAME)'

 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAGICK)/$(PERLSTATICNAME)
-@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) -f Makefile.aperl CC='@CC@' test
+@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) -f Makefile.aperl CC='@CC@' test

 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAGICK)/$(PERLSTATICNAME)


--- a/PerlMagick/Makefile.am
+++ b/PerlMagick/Makefile.am
@@ -57,7 +57,7 @@ uninstall-exec-perl: $(PERLMAKEFILE)
 	echo "Uninstall not supported for PerlMagick"

 check-perl: $(PERLMAKEFILE)
-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test
+	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test

 perl-build: $(PERLMAKEFILE)
 	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
@@ -95,7 +95,7 @@ uninstall-exec-perl:
 	rm -f '$(DESTDIR)$(BIN_DIR)/$(PERLSTATICNAME)'

 check-perl: $(PERLMAGICK)/$(PERLSTATICNAME)
-	cd $(PERLMAGICK) && $(MAKE) -f Makefile.aperl CC='@CC@' test
+	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) -f Makefile.aperl CC='@CC@' test

 perl-build: $(PERLMAGICK)/$(PERLSTATICNAME)


--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
  <configure name="NAME" value="ImageMagick"/>
  <configure name="LIB_VERSION" value="0x659"/>
  <configure name="LIB_VERSION_NUMBER" value="6,5,9,0"/>
-  <configure name="RELEASE_DATE" value="2010-01-01"/>
+  <configure name="RELEASE_DATE" value="2010-01-04"/>
  <configure name="CONFIGURE" value="./configure "/>
  <configure name="PREFIX" value="/usr/local"/>
  <configure name="EXEC-PREFIX" value="/usr/local"/>

--- a/configure
+++ b/configure
@@ -982,7 +982,8 @@ WITH_LTDL_FALSE
 WITH_LTDL_TRUE
 WITH_MODULES_FALSE
 WITH_MODULES_TRUE
-LTCXXLIBOPTS
+WITH_SHARED_LIBS_FALSE
+WITH_SHARED_LIBS_TRUE
 LTDLOPEN
 LT_CONFIG_H
 CONVENIENCE_LTDL_FALSE
@@ -6841,17 +6842,14 @@ fi


 GDI32_LIBS=''
-StaticCplusPlusLibraries='no'
 native_win32_build='no'
 cygwin_build='no'
 case "${host_os}" in
    cygwin* )
-        StaticCplusPlusLibraries='yes'
        cygwin_build='yes'
        GDI32_LIBS='-lgdi32'
    ;;
    mingw* )
-        StaticCplusPlusLibraries='yes'
        native_win32_build='yes'
        GDI32_LIBS='-lgdi32'
    ;;
@@ -8181,13 +8179,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:8184: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8182: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:8187: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8185: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:8190: output\"" >&5)
+  (eval echo "\"\$as_me:8188: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -9378,7 +9376,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 9381 "configure"' > conftest.$ac_ext
+  echo '#line 9379 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -11463,11 +11461,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11464: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:11470: \$? = $ac_status" >&5
+   echo "$as_me:11468: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -11802,11 +11800,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11805: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11803: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:11809: \$? = $ac_status" >&5
+   echo "$as_me:11807: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -11907,11 +11905,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11910: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11908: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:11914: \$? = $ac_status" >&5
+   echo "$as_me:11912: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -11962,11 +11960,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11965: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11963: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:11969: \$? = $ac_status" >&5
+   echo "$as_me:11967: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -14332,7 +14330,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 14335 "configure"
+#line 14333 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -14428,7 +14426,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 14431 "configure"
+#line 14429 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -16384,11 +16382,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:16391: \$? = $ac_status" >&5
+   echo "$as_me:16389: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -16483,11 +16481,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16486: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:16490: \$? = $ac_status" >&5
+   echo "$as_me:16488: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -16535,11 +16533,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16538: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16536: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:16542: \$? = $ac_status" >&5
+   echo "$as_me:16540: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -17947,7 +17945,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 17950 "configure"
+#line 17948 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -18563,10 +18561,12 @@ if test "$enable_static" = 'yes'; then
    libtool_build_static_libs='yes'
 fi

-# MinGW and Cygwin can't build C++ DLLs which support exceptions.
-if test "${StaticCplusPlusLibraries}" = 'yes'; then
-    LTCXXLIBOPTS='--static'
-
+ if test "${libtool_build_shared_libs}" = 'yes'; then
+  WITH_SHARED_LIBS_TRUE=
+  WITH_SHARED_LIBS_FALSE='#'
+else
+  WITH_SHARED_LIBS_TRUE='#'
+  WITH_SHARED_LIBS_FALSE=
 fi

 #
@@ -31070,6 +31070,10 @@ LT_CONFIG_H=config/config.h
    ltdl_LTLIBOBJS=$_ltdl_ltlibobjs


+if test -z "${WITH_SHARED_LIBS_TRUE}" && test -z "${WITH_SHARED_LIBS_FALSE}"; then
+  as_fn_error "conditional \"WITH_SHARED_LIBS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_MODULES_TRUE}" && test -z "${WITH_MODULES_FALSE}"; then
  as_fn_error "conditional \"WITH_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

--- a/configure.ac
+++ b/configure.ac
@@ -256,17 +256,14 @@ AC_EXEEXT
 AC_OBJEXT

 GDI32_LIBS=''
-StaticCplusPlusLibraries='no'
 native_win32_build='no'
 cygwin_build='no'
 case "${host_os}" in
    cygwin* )
-        StaticCplusPlusLibraries='yes'
        cygwin_build='yes'
        GDI32_LIBS='-lgdi32'
    ;;
    mingw* )
-        StaticCplusPlusLibraries='yes'
        native_win32_build='yes'
        GDI32_LIBS='-lgdi32'
    ;;
@@ -449,12 +446,7 @@ if test "$enable_static" = 'yes'; then
    libtool_build_static_libs='yes'
 fi

-# MinGW and Cygwin can't build C++ DLLs which support exceptions.
-if test "${StaticCplusPlusLibraries}" = 'yes'; then
-    LTCXXLIBOPTS='--static'
-    AC_SUBST(LTCXXLIBOPTS)
-fi
-
+AM_CONDITIONAL(WITH_SHARED_LIBS, test "${libtool_build_shared_libs}" = 'yes')
 #
 # Enable support for building loadable modules
 #
@@ -560,7 +552,7 @@ AC_ARG_ENABLE([hdri],
 MAGICK_HDRI=""
 if test "$enable_hdri" = 'yes'; then
    MAGICK_HDRI="HDRI"
-    AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels  in real scenes])
+    AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels in real scenes])
 fi
 AC_SUBST(MAGICK_HDRI)dnl


--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1933,7 +1933,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
      zero;

    ResampleFilter
-      **resample_filter;
+      **restrict resample_filter;

    CacheView
      *distort_view;

--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1085,6 +1085,10 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
  AffineMatrix
    inverse_affine;

+  CacheView
+    *image_view,
+    *source_view;
+
  ExceptionInfo
    *exception;

@@ -1107,15 +1111,11 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
    i;

  ResampleFilter
-    **resample_filter;
+    **restrict resample_filter;

  SegmentInfo
    edge;

-  CacheView
-    *image_view,
-    *source_view;
-
  /*
    Determine bounding box.
  */
@@ -3589,7 +3589,7 @@ static PolygonInfo **AcquirePolygonThreadSet(const DrawInfo *draw_info,
  const PrimitiveInfo *primitive_info)
 {
  PathInfo
-    *path_info;
+    *restrict path_info;

  register long
    i;
@@ -3794,6 +3794,9 @@ static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
 static MagickBooleanType DrawPolygonPrimitive(Image *image,
  const DrawInfo *draw_info,const PrimitiveInfo *primitive_info)
 {
+  CacheView
+    *image_view;
+
  ExceptionInfo
    *exception;

@@ -3810,7 +3813,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
    mid;

  PolygonInfo
-    **polygon_info;
+    **restrict polygon_info;

  register EdgeInfo
    *p;
@@ -3821,9 +3824,6 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
  SegmentInfo
    bounds;

-  CacheView
-    *image_view;
-
  /*
    Compute bounding box.
  */

--- a/magick/effect.c
+++ b/magick/effect.c
@@ -1797,8 +1797,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
    status;

  Quantum
-    **buffers,
-    **pixels;
+    **restrict buffers,
+    **restrict pixels;

  size_t
    length;
@@ -2545,7 +2545,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
    status;

  MedianPixelList
-    **pixel_list;
+    **restrict pixel_list;

  unsigned long
    width;
@@ -3879,6 +3879,10 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
 {
 #define ReduceNoiseImageTag  "ReduceNoise/Image"

+  CacheView
+    *image_view,
+    *noise_view;
+
  Image
    *noise_image;

@@ -3890,15 +3894,11 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
    status;

  MedianPixelList
-    **pixel_list;
+    **restrict pixel_list;

  unsigned long
    width;

-  CacheView
-    *image_view,
-    *noise_view;
-
  /*
    Initialize noise image attributes.
  */
@@ -4766,6 +4766,9 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
 {
 #define SpreadImageTag  "Spread/Image"

+  CacheView
+    *image_view;
+
  Image
    *spread_image;

@@ -4780,17 +4783,14 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
    bias;

  RandomInfo
-    **random_info;
+    **restrict random_info;

  ResampleFilter
-    **resample_filter;
+    **restrict resample_filter;

  unsigned long
    width;

-  CacheView
-    *image_view;
-
  /*
    Initialize spread image attributes.
  */

--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -615,6 +615,9 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
 {
 #define ClutImageTag  "Clut/Image"

+  CacheView
+    *image_view;
+
  ExceptionInfo
    *exception;

@@ -630,10 +633,7 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
    zero;

  ResampleFilter
-    **resample_filter;
-
-  CacheView
-    *image_view;
+    **restrict resample_filter;

  assert(image != (Image *) NULL);
  assert(image->signature == MagickSignature);
@@ -2169,6 +2169,9 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
      z;
  } HaldInfo;

+  CacheView
+    *image_view;
+
  double
    width;

@@ -2186,16 +2189,13 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
    zero;

  ResampleFilter
-    **resample_filter;
+    **restrict resample_filter;

  size_t
    cube_size,
    length,
    level;

-  CacheView
-    *image_view;
-
  assert(image != (Image *) NULL);
  assert(image->signature == MagickSignature);
  if (image->debug != MagickFalse)

--- a/magick/fx.c
+++ b/magick/fx.c
@@ -281,6 +281,10 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
 {
 #define AddNoiseImageTag  "AddNoise/Image"

+  CacheView
+    *image_view,
+    *noise_view;
+
  const char
    *option;

@@ -298,11 +302,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
    attenuate;

  RandomInfo
-    **random_info;
-
-  CacheView
-    *image_view,
-    *noise_view;
+    **restrict random_info;

  /*
    Initialize noise image attributes.
@@ -1081,6 +1081,9 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
 {
 #define EvaluateImageTag  "Evaluate/Image "

+  CacheView
+    *image_view;
+
  long
    progress,
    y;
@@ -1089,10 +1092,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
    status;

  RandomInfo
-    **random_info;
-
-  CacheView
-    *image_view;
+    **restrict random_info;

  assert(image != (Image *) NULL);
  assert(image->signature == MagickSignature);
@@ -3126,8 +3126,11 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
 {
 #define FxImageTag  "Fx/Image"

+  CacheView
+    *fx_view;
+
  FxInfo
-    **fx_info;
+    **restrict fx_info;

  Image
    *fx_image;
@@ -3142,9 +3145,6 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
  MagickRealType
    alpha;

-  CacheView
-    *fx_view;
-
  assert(image != (Image *) NULL);
  assert(image->signature == MagickSignature);
  if (image->debug != MagickFalse)
@@ -3308,6 +3308,10 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
 {
 #define ImplodeImageTag  "Implode/Image"

+  CacheView
+    *image_view,
+    *implode_view;
+
  Image
    *implode_image;

@@ -3329,11 +3333,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
    scale;

  ResampleFilter
-    **resample_filter;
-
-  CacheView
-    *image_view,
-    *implode_view;
+    **restrict resample_filter;

  /*
    Initialize implode image attributes.
@@ -4714,6 +4714,9 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
 MagickExport Image *SketchImage(const Image *image,const double radius,
  const double sigma,const double angle,ExceptionInfo *exception)
 {
+  CacheView
+    *random_view;
+
  Image
    *blend_image,
    *blur_image,
@@ -4731,10 +4734,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
    zero;

  RandomInfo
-    **random_info;
-
-  CacheView
-    *random_view;
+    **restrict random_info;

  /*
    Sketch image.
@@ -5276,6 +5276,10 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
 {
 #define SwirlImageTag  "Swirl/Image"

+  CacheView
+    *image_view,
+    *swirl_view;
+
  Image
    *swirl_image;

@@ -5297,11 +5301,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
    scale;

  ResampleFilter
-    **resample_filter;
-
-  CacheView
-    *image_view,
-    *swirl_view;
+    **restrict resample_filter;

  /*
    Initialize swirl image attributes.
@@ -5743,6 +5743,9 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
 {
 #define WaveImageTag  "Wave/Image"

+  CacheView
+    *wave_view;
+
  Image
    *wave_image;

@@ -5763,10 +5766,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
    i;

  ResampleFilter
-    **resample_filter;
-
-  CacheView
-    *wave_view;
+    **restrict resample_filter;

  /*
    Initialize wave image attributes.

--- a/magick/paint.c
+++ b/magick/paint.c
@@ -548,6 +548,10 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
 #define NumberPaintBins  256
 #define OilPaintImageTag  "OilPaint/Image"

+  CacheView
+    *image_view,
+    *paint_view;
+
  Image
    *paint_image;

@@ -559,13 +563,9 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
    status;

  unsigned long
-    **histograms,
+    **restrict histograms,
    width;

-  CacheView
-    *image_view,
-    *paint_view;
-
  /*
    Initialize painted image attributes.
  */

--- a/magick/profile.c
+++ b/magick/profile.c
@@ -912,7 +912,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
            target_profile;

          cmsHTRANSFORM
-            *transform;
+            *restrict transform;

          DWORD
            flags,
@@ -938,8 +938,8 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
            target_channels;

          unsigned short
-            **source_pixels,
-            **target_pixels;
+            **restrict source_pixels,
+            **restrict target_pixels;

          /*
            Transform pixel colors as defined by the color profiles.

--- a/magick/resize.c
+++ b/magick/resize.c
@@ -1668,11 +1668,15 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
 {
 #define ResizeImageTag  "Resize/Image"

+  CacheView
+    *image_view,
+    *resize_view;
+
  ClassType
    storage_class;

  ContributionInfo
-    **contributions;
+    **restrict contributions;

  long
    x;
@@ -1687,10 +1691,6 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
    scale,
    support;

-  CacheView
-    *image_view,
-    *resize_view;
-
  /*
    Apply filter to resize horizontally from image to resize image.
  */
@@ -1909,11 +1909,15 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
  const Image *image,Image *resize_image,const MagickRealType y_factor,
  const MagickSizeType span,MagickOffsetType *quantum,ExceptionInfo *exception)
 {
+  CacheView
+    *image_view,
+    *resize_view;
+
  ClassType
    storage_class;

  ContributionInfo
-    **contributions;
+    **restrict contributions;

  long
    y;
@@ -1928,10 +1932,6 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
    scale,
    support;