GraphicsMagick: 2 new changesets

changeset dadecbb44c39 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=dadecbb44c39
summary: Do not include "stdint.h" directly.

changeset 14faaf42630a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=14faaf42630a
summary: Merge branches.

diffstat:

 ChangeLog                                   |  10 ++++++++++
 NEWS.txt                                    |   2 +-
 jp2/src/libjasper/include/jasper/jas_math.h |   2 +-
 magick/enhance.c                            |   2 +-
 magick/gem.c                                |   2 +-
 tiff/libtiff/tif_hash_set.c                 |   2 +-
 www/Changelog.html                          |  23 +++++++++++++++++++++++
 www/NEWS.html                               |   2 +-
 8 files changed, 39 insertions(+), 6 deletions(-)

diffs (122 lines):

diff -r 0b3d574d4ad5 -r 14faaf42630a ChangeLog
--- a/ChangeLog	Mon Dec 26 00:03:56 2022 +0100
+++ b/ChangeLog	Mon Dec 26 01:02:51 2022 +0100
@@ -1,3 +1,13 @@
+2022-12-25  Bob Friesenhahn  <[email protected]>
+
+	* magick/gem.c (Contrast): Visual Studio 17.4.3 does not like
+	initializing a static constant with "0.5+MagickEpsilon" in
+	/precise mode.
+
+	* magick/enhance.c (ContrastImagePixels): Visual Studio 17.4.3
+	does not like initializing a static constant with
+	"0.5+MagickEpsilon" in /precise mode.
+
 2022-12-25 Fojtik Jaroslav  <[email protected]>
 
 	* webp/src/webp/types.h Need to include inttypes.h
diff -r 0b3d574d4ad5 -r 14faaf42630a NEWS.txt
--- a/NEWS.txt	Mon Dec 26 00:03:56 2022 +0100
+++ b/NEWS.txt	Mon Dec 26 01:02:51 2022 +0100
@@ -157,7 +157,7 @@
 
 Windows Delegate Updates/Additions:
 
-* Update bundled libjasper to version 1.900.16.
+* Update bundled libjasper to version 1.900.26.
 
 * Update bundled libjpeg to version 9e.
 
diff -r 0b3d574d4ad5 -r 14faaf42630a jp2/src/libjasper/include/jasper/jas_math.h
--- a/jp2/src/libjasper/include/jasper/jas_math.h	Mon Dec 26 00:03:56 2022 +0100
+++ b/jp2/src/libjasper/include/jasper/jas_math.h	Mon Dec 26 01:02:51 2022 +0100
@@ -83,7 +83,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "stdbool2.h"
-#include <stdint.h>
+//#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -r 0b3d574d4ad5 -r 14faaf42630a magick/enhance.c
--- a/magick/enhance.c	Mon Dec 26 00:03:56 2022 +0100
+++ b/magick/enhance.c	Mon Dec 26 01:02:51 2022 +0100
@@ -169,7 +169,7 @@
     sign = *((const double *) immutable_data);
 
   static const double
-    alpha=0.5+MagickEpsilon;
+    alpha=0.50000000000099997787827987849595956504344940185546875; /* 0.5+MagickEpsilon */
 
   register long
     i;
diff -r 0b3d574d4ad5 -r 14faaf42630a magick/gem.c
--- a/magick/gem.c	Mon Dec 26 00:03:56 2022 +0100
+++ b/magick/gem.c	Mon Dec 26 01:02:51 2022 +0100
@@ -70,7 +70,7 @@
   Quantum *blue)
 {
   static const double
-    alpha=0.5+MagickEpsilon;
+    alpha=0.50000000000099997787827987849595956504344940185546875; /* 0.5+MagickEpsilon */
 
   double
     brightness,
diff -r 0b3d574d4ad5 -r 14faaf42630a tiff/libtiff/tif_hash_set.c
--- a/tiff/libtiff/tif_hash_set.c	Mon Dec 26 00:03:56 2022 +0100
+++ b/tiff/libtiff/tif_hash_set.c	Mon Dec 26 01:02:51 2022 +0100
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 #include "stdbool2.h"
-#include <stdint.h>
+//#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff -r 0b3d574d4ad5 -r 14faaf42630a www/Changelog.html
--- a/www/Changelog.html	Mon Dec 26 00:03:56 2022 +0100
+++ b/www/Changelog.html	Mon Dec 26 01:02:51 2022 +0100
@@ -40,6 +40,29 @@
 <p>2022-12-25  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">
+<li><p>magick/gem.c (Contrast): Visual Studio 17.4.3 does not like
+initializing a static constant with &quot;0.5+MagickEpsilon&quot; in
+/precise mode.</p></li>
+<li><p>magick/enhance.c (ContrastImagePixels): Visual Studio 17.4.3
+does not like initializing a static constant with
+&quot;0.5+MagickEpsilon&quot; in /precise mode.</p></li>
+</ul>
+</blockquote>
+<p>2022-12-25 Fojtik Jaroslav  &lt;<a class="reference external" href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>webp/src/webp/types.h Need to include inttypes.h</p></li>
+<li><dl class="simple">
+<dt>jp2/src/libjasper/include/jasper/jas_types.h</dt>
+<dd><p>Fix missing _PFX_PTR in newer MSVC.</p>
+</dd>
+</dl>
+</li>
+</ul>
+</blockquote>
+<p>2022-12-25  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
 <li><p>magick/symbols.h: Update symbol remappings which are enabled by
 PREFIX_MAGICK_SYMBOLS.  The only new symbol since the last release
 is IsEventLogged().</p></li>
diff -r 0b3d574d4ad5 -r 14faaf42630a www/NEWS.html
--- a/www/NEWS.html	Mon Dec 26 00:03:56 2022 +0100
+++ b/www/NEWS.html	Mon Dec 26 01:02:51 2022 +0100
@@ -203,7 +203,7 @@
 </ul>
 <p>Windows Delegate Updates/Additions:</p>
 <ul class="simple">
-<li><p>Update bundled libjasper to version 1.900.16.</p></li>
+<li><p>Update bundled libjasper to version 1.900.26.</p></li>
 <li><p>Update bundled libjpeg to version 9e.</p></li>
 <li><p>Update bundled libtiff to version 4.5.0 (but still compilable using MSVC2008!).</p></li>
 </ul>