SO Bump due to security policy improvements

diff --git a/ChangeLog b/ChangeLog
index 97db83a0c30032c3df96851e814f75db034a3deb..1a0b8425657c4fe79f69767195aae89833a1f45e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
     https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31377).
   * Don't set update trait on alpha channel (private e-mail concerning
     -levels-colors option).
+  * SO Bump due to security policy improvements.
 
 2017-02-04  7.0.4-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.4-7, GIT revision 19513:5783e57:20170204.

diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
index be42d82933c8e4ba4d2b310102993bfca7f0ea5e..f174482664265cb0a21351306e577fbe0f580503 100644 (file)
--- a/MagickCore/libMagickCore.map
+++ b/MagickCore/libMagickCore.map
@@ -1,4 +1,4 @@
- VERS_2.0 {
+ VERS_3.0 {
         global:
                 *;
      };

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 41cc520888e1922b4da285fe1498dc27e7ad83ab..a3619c721b8498ed7d17edf90ad4c0f35392e9a0 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -2043,7 +2043,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
       double
         count;
 
-      count=histogram[GetPixelChannels(image)*j+i]*area;
+      count=area*histogram[GetPixelChannels(image)*j+i];
       if (number_bins > MagickEpsilon)
         channel_statistics[i].entropy+=-count*MagickLog10(count)/
           MagickLog10(number_bins);

diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
index be42d82933c8e4ba4d2b310102993bfca7f0ea5e..f174482664265cb0a21351306e577fbe0f580503 100644 (file)
--- a/MagickWand/libMagickWand.map
+++ b/MagickWand/libMagickWand.map
@@ -1,4 +1,4 @@
- VERS_2.0 {
+ VERS_3.0 {
         global:
                 *;
      };

diff --git a/configure b/configure
index 2c9085e4ecd7e3c71f2e743baf9c10d7de05fbbc..7188f92dcf2765d3228e1d1d9c4f68fa4e291bcf 100755 (executable)
--- a/configure
+++ b/configure
@@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.4-8
 
-MAGICK_GIT_REVISION=19515:3e9a13b:20170204
+MAGICK_GIT_REVISION=19565:4d59d2b:20170212
 
 
 # Substitute library versioning

diff --git a/version.sh b/version.sh
index da73f5c31927118c53a104ef37f4800d0d11134e..af47b5d26c69168c8d8eb009d9aa6818499684b1 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -40,7 +40,7 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
 # PLEASE NOTE that doing a SO BUMP aka raising the CURRENT REVISION
 # could be avoided using libversioning aka map files.  You MUST change .map
 # files if you raise these versions.
-MAGICK_LIBRARY_CURRENT=2
+MAGICK_LIBRARY_CURRENT=3
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0