GraphicsMagick: 3 new changesets

changeset 32ab70c833f9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=32ab70c833f9
summary: Eliminate warning about snprintf macro redefinition

changeset 9b7949df8f16 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=9b7949df8f16
summary: Fix jasper utility compilation when strtoull is not available.

changeset 835f209c7420 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=835f209c7420
summary: Eliminate warnings about unused variables

diffstat:

 jp2/src/appl/jasper.c              |  4 ++++
 jp2/src/libjasper/base/jas_image.c |  2 --
 libxml/include/win32config.h       |  2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 14faaf42630a -r 835f209c7420 jp2/src/appl/jasper.c
--- a/jp2/src/appl/jasper.c	Mon Dec 26 01:02:51 2022 +0100
+++ b/jp2/src/appl/jasper.c	Mon Dec 26 09:00:44 2022 -0600
@@ -423,7 +423,11 @@
 			cmdopts->srgb = 1;
 			break;
 		case CMDOPT_MAXMEM:
+#if defined(_MSC_VER) && _MSC_VER < 1900
+			cmdopts->max_mem = strtoul(jas_optarg, 0, 10);
+#else
 			cmdopts->max_mem = strtoull(jas_optarg, 0, 10);
+#endif
 			break;
 		default:
 			badusage();
diff -r 14faaf42630a -r 835f209c7420 jp2/src/libjasper/base/jas_image.c
--- a/jp2/src/libjasper/base/jas_image.c	Mon Dec 26 01:02:51 2022 +0100
+++ b/jp2/src/libjasper/base/jas_image.c	Mon Dec 26 09:00:44 2022 -0600
@@ -1364,8 +1364,6 @@
 {
 	int n;
 	int c;
-	bool s;
-	jas_ulong tmp;
 	assert((!sgnd && prec >= 1) || (sgnd && prec >= 2));
 	if (sgnd) {
 		val = encode_twos_comp(val, prec);
diff -r 14faaf42630a -r 835f209c7420 libxml/include/win32config.h
--- a/libxml/include/win32config.h	Mon Dec 26 01:02:51 2022 +0100
+++ b/libxml/include/win32config.h	Mon Dec 26 09:00:44 2022 -0600
@@ -91,7 +91,7 @@
 
 #if defined(_MSC_VER)
 #define mkdir(p,m) _mkdir(p)
-#if _MSC_VER < 1900
+#if _MSC_VER < 1900 && !defined(snprintf)
 #define snprintf _snprintf
 #endif
 #if _MSC_VER < 1500