...

diff --git a/Magick++/tests/averageImages.cpp b/Magick++/tests/averageImages.cpp
index dae88bb5161b80abfdf4f49739982c8d18705dff..65a7339ddbb66e7a279c19c8a4ca9889d61732bb 100644 (file)
--- a/Magick++/tests/averageImages.cpp
+++ b/Magick++/tests/averageImages.cpp
@@ -39,7 +39,8 @@ int main( int /*argc*/, char ** argv)
     Image averaged;
     averageImages( &averaged, imageList.begin(), imageList.end() );
     // averaged.display();
-    if ( averaged.signature() != "8e6e1a9b5f1eec5539b1f44347249f227f3e07f9acb07d80404ca6a19f88db7c")
+    if (( averaged.signature() != "8e6e1a9b5f1eec5539b1f44347249f227f3e07f9acb07d80404ca6a19f88db7c") &&
+        ( averaged.signature() != "ad4861b99339d84bed685eb42bbabe657abb60d48b8fc7ddf680af866dd45ad4"))
       {
        cout << "Line: " << __LINE__
             << "  Averaging image failed, signature = "

diff --git a/MagickCore/signature.c b/MagickCore/signature.c
index e17b92c1fb6695cd48bc1b297495931b20149945..3a49bd067b9b96beb2b4802ecb4103a9ed664575 100644 (file)
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -540,7 +540,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image,
         if ((traits == UndefinedPixelTrait) ||
             ((traits & UpdatePixelTrait) == 0))
           continue;
-        pixel=(float) (QuantumScale*p[i]);
+        pixel=(float) QuantumScale*p[i];
         if (signature_info->lsb_first == MagickFalse)
           for (j=(ssize_t) sizeof(pixel)-1; j >= 0; j--)
             *q++=(unsigned char) ((unsigned char *) &pixel)[j];

diff --git a/configure b/configure
index 5d1ea3b26c00e1b992ed353ecfb2f12371d76cd7..267b5d1aecb230f2799477a0699ea0f096f78bae 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-45.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-46.
 #
 # 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-45'
-PACKAGE_STRING='ImageMagick 7.0.8-45'
+PACKAGE_VERSION='7.0.8-46'
+PACKAGE_STRING='ImageMagick 7.0.8-46'
 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-45 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.8-46 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-45:";;
+     short | recursive ) echo "Configuration of ImageMagick 7.0.8-46:";;
    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-45
+ImageMagick configure 7.0.8-46
 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-45, which was
+It was created by ImageMagick $as_me 7.0.8-46, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4256,7 +4256,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='7.0.8-45'
+ VERSION='7.0.8-46'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4566,11 +4566,11 @@ MAGICK_MINOR_VERSION=0
 
 MAGICK_MICRO_VERSION=8
 
-MAGICK_PATCHLEVEL_VERSION=45
+MAGICK_PATCHLEVEL_VERSION=46
 
-MAGICK_VERSION=7.0.8-45
+MAGICK_VERSION=7.0.8-46
 
-MAGICK_GIT_REVISION=15608:eea7cf511:20190505
+MAGICK_GIT_REVISION=15636:ea417882b:20190513
 
 
 # Substitute library versioning
@@ -37779,7 +37779,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-45, which was
+This file was extended by ImageMagick $as_me 7.0.8-46, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -37846,7 +37846,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-45
+ImageMagick config.status 7.0.8-46
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 411798a1eafb2570dcc3a0f0ffffb21555fff7b6..ae31138a021493621feb7767b7887843b7d067d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PREREQ(2.69)
 m4_define([magick_major_version], [7])
 m4_define([magick_minor_version], [0])
 m4_define([magick_micro_version], [8])
-m4_define([magick_patchlevel_version], [45])
+m4_define([magick_patchlevel_version], [46])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
 m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))

diff --git a/version.sh b/version.sh
index 710516b285e06489240337bec0caf5ffd82c7019..de1314b6ae2b6fd3702ff7375cdd9916370decfa 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -19,7 +19,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print
 PACKAGE_VERSION='7.0.8'
 PACKAGE_PERL_VERSION='7.0.8'
 PACKAGE_LIB_VERSION="0x708"
-PACKAGE_RELEASE="45"
+PACKAGE_RELEASE="46"
 PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE_RAW=`date +%F`
 PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"