...

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index e91c81d2f2312eba653e3a28db712aafc559d22d..5d67106d009dcd6b0e6fb0f8d57c9bb04880c208 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -730,11 +730,27 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
   assert(image != (Image *) NULL);
   page=image->page;
   rotations%=4;
-  if ((rotations == 1) || (rotations == 3))
-    rotate_image=CloneImage(image,image->rows,image->columns,MagickTrue,
-      exception);
-  else
-    rotate_image=CloneImage(image,0,0,MagickTrue,exception);
+  switch (rotations)
+  {
+    case 0:
+    {
+      rotate_image=CloneImage(image,0,0,MagickTrue,exception);
+      break;
+    }
+    case 2:
+    {
+      rotate_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+        exception);
+      break;
+    }
+    case 1:
+    case 3:
+    {
+      rotate_image=CloneImage(image,image->rows,image->columns,MagickTrue,
+        exception);
+      break;
+    }
+  }
   if (rotate_image == (Image *) NULL)
     return((Image *) NULL);
   /*
@@ -742,8 +758,11 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
   */
   status=MagickTrue;
   progress=0;
-  image_view=AcquireVirtualCacheView(image,exception);
-  rotate_view=AcquireAuthenticCacheView(rotate_image,exception);
+  if (rotations != 0)
+    {
+      image_view=AcquireVirtualCacheView(image,exception);
+      rotate_view=AcquireAuthenticCacheView(rotate_image,exception);
+    }
   switch (rotations)
   {
     case 1:
@@ -1067,8 +1086,11 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
     default:
       break;
   }
-  rotate_view=DestroyCacheView(rotate_view);
-  image_view=DestroyCacheView(image_view);
+  if (rotations != 0)
+    {
+      rotate_view=DestroyCacheView(rotate_view);
+      image_view=DestroyCacheView(image_view);
+    }
   rotate_image->type=image->type;
   rotate_image->page=page;
   if (status == MagickFalse)

diff --git a/configure b/configure
index 8917063540d56de9034c2585daeeeb4e1bd8e9c2..b2f29692c5c38e9ded1f87bb813fe3b48d883530 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-59.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-60.
 #
 # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='7.0.8-59'
-PACKAGE_STRING='ImageMagick 7.0.8-59'
+PACKAGE_VERSION='7.0.8-60'
+PACKAGE_STRING='ImageMagick 7.0.8-60'
 PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
 PACKAGE_URL='https://imagemagick.org'
 
@@ -1852,7 +1852,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 7.0.8-59 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.8-60 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1927,7 +1927,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 7.0.8-59:";;
+     short | recursive ) echo "Configuration of ImageMagick 7.0.8-60:";;
    esac
   cat <<\_ACEOF
 
@@ -2219,7 +2219,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 7.0.8-59
+ImageMagick configure 7.0.8-60
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3270,7 +3270,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 7.0.8-59, which was
+It was created by ImageMagick $as_me 7.0.8-60, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3626,7 +3626,7 @@ ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
+    ac_install_sh="$SHELL $ac_pwd/$ac_aux_dir/install-sh -c"
     break
   elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
@@ -4256,7 +4256,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='7.0.8-59'
+ VERSION='7.0.8-60'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4566,11 +4566,11 @@ MAGICK_MINOR_VERSION=0
 
 MAGICK_MICRO_VERSION=8
 
-MAGICK_PATCHLEVEL_VERSION=59
+MAGICK_PATCHLEVEL_VERSION=60
 
-MAGICK_VERSION=7.0.8-59
+MAGICK_VERSION=7.0.8-60
 
-MAGICK_GIT_REVISION=15963:ac52f9d86:20190730
+MAGICK_GIT_REVISION=15992:baab586bc:20190804
 
 
 # Substitute library versioning
@@ -37780,7 +37780,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 7.0.8-59, which was
+This file was extended by ImageMagick $as_me 7.0.8-60, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -37847,7 +37847,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 7.0.8-59
+ImageMagick config.status 7.0.8-60
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"