From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 12 Feb 2017 18:54:21 +0000 (-0500)
Subject: SO Bump due to security policy improvements
X-Git-Tag: 7.0.4-8~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=484464a27b509c8a7342c73b2bb98d3281b2037b;p=imagemagick

SO Bump due to security policy improvements
---

diff --git a/ChangeLog b/ChangeLog
index 97db83a0c..1a0b84256 100644
--- 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 be42d8293..f17448266 100644
--- 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 41cc52088..a3619c721 100644
--- 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 be42d8293..f17448266 100644
--- 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 2c9085e4e..7188f92dc 100755
--- 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 da73f5c31..af47b5d26 100644
--- 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