GraphicsMagick: Fix use of heif_init(). Fix test for _OPENMP. Re...

changeset d013dd7972f9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=d013dd7972f9
summary: Fix use of heif_init(). Fix test for _OPENMP. Remove redundant LIB_MATH=-lm

diffstat:

 ChangeLog                              |  7 +++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 coders/heif.c                          |  3 ++-
 configure                              |  9 ++++-----
 configure.ac                           |  5 ++---
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  8 ++++++++
 7 files changed, 27 insertions(+), 13 deletions(-)

diffs (118 lines):

diff -r 6f2469265b28 -r d013dd7972f9 ChangeLog
--- a/ChangeLog	Tue Nov 28 16:17:12 2023 -0600
+++ b/ChangeLog	Wed Nov 29 07:29:27 2023 -0600
@@ -1,3 +1,10 @@
+2023-11-29  Bob Friesenhahn  <[email protected]>
+
+	* coders/heif.c (ReadHEIFImage): heif_init() expects an argument.
+
+	* configure.ac: Fix typo when testing for _OPENMP which caused the
+	test to always pass.  Remove forced LIB_MATH=-lm.
+
 2023-11-28  Bob Friesenhahn  <[email protected]>
 
 	* fuzzing/oss-fuzz-build.sh: Continued work on the oss-fuzz build
diff -r 6f2469265b28 -r d013dd7972f9 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Nov 28 16:17:12 2023 -0600
+++ b/VisualMagick/installer/inc/version.isx	Wed Nov 29 07:29:27 2023 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020231128"
-#define public MagickPackageReleaseDate "snapshot-20231128"
+#define public MagickPackageVersionAddendum ".020231129"
+#define public MagickPackageReleaseDate "snapshot-20231129"
diff -r 6f2469265b28 -r d013dd7972f9 coders/heif.c
--- a/coders/heif.c	Tue Nov 28 16:17:12 2023 -0600
+++ b/coders/heif.c	Wed Nov 29 07:29:27 2023 -0600
@@ -498,7 +498,8 @@
 #ifdef HAVE_HEIF_INIT
   if (!heif_initialized)
     {
-      heif_init();
+      /* heif_init() accepts a 'struct heif_init_params *' argument */
+      heif_init((struct heif_init_params *) NULL);
       heif_initialized = MagickTrue;
     }
 #endif /* HAVE_HEIF_INIT */
diff -r 6f2469265b28 -r d013dd7972f9 configure
--- a/configure	Tue Nov 28 16:17:12 2023 -0600
+++ b/configure	Wed Nov 29 07:29:27 2023 -0600
@@ -7670,7 +7670,7 @@
 if test "x$ac_cv_have_decl__OPENMP" = xyes; then :
   OPENMP_ENABLED='yes'
 else
-  OPENMP_ENABLED='yes'
+  OPENMP_ENABLED='no'
 fi
 
 
@@ -23714,10 +23714,9 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
 $as_echo "$ac_cv_lib_m_sqrt" >&6; }
 if test "x$ac_cv_lib_m_sqrt" = xyes; then :
-  LIB_MATH="-lm"
-fi
-
-LIB_MATH='-lm'
+  LIB_MATH='-lm'
+fi
+
 LIBS="$LIB_MATH $LIBS"
 #printf "LIBS=${LIBS}\n"
 
diff -r 6f2469265b28 -r d013dd7972f9 configure.ac
--- a/configure.ac	Tue Nov 28 16:17:12 2023 -0600
+++ b/configure.ac	Wed Nov 29 07:29:27 2023 -0600
@@ -351,7 +351,7 @@
 #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
 #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
 AC_SUBST([OPENMP_CFLAGS])
-AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='yes'],[])
+AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='no'],[])
 
 # Allow the user to disable use of OpenMP where algorithms sometimes run slower.
 AC_ARG_ENABLE([openmp-slow],
@@ -1766,8 +1766,7 @@
 # Find math library (no pkg-config support!)
 #
 LIB_MATH=''
-AC_CHECK_LIB([m],[sqrt],[LIB_MATH="-lm"],,)
-LIB_MATH='-lm'
+AC_CHECK_LIB([m],[sqrt],[LIB_MATH='-lm'],,)
 LIBS="$LIB_MATH $LIBS"
 #printf "LIBS=${LIBS}\n"
 AC_SUBST([LIB_MATH])
diff -r 6f2469265b28 -r d013dd7972f9 magick/version.h
--- a/magick/version.h	Tue Nov 28 16:17:12 2023 -0600
+++ b/magick/version.h	Wed Nov 29 07:29:27 2023 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272404
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,4
-#define MagickChangeDate   "20231128"
-#define MagickReleaseDate  "snapshot-20231128"
+#define MagickChangeDate   "20231129"
+#define MagickReleaseDate  "snapshot-20231129"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6f2469265b28 -r d013dd7972f9 www/Changelog.html
--- a/www/Changelog.html	Tue Nov 28 16:17:12 2023 -0600
+++ b/www/Changelog.html	Wed Nov 29 07:29:27 2023 -0600
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2023-11-29  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>coders/heif.c (ReadHEIFImage): heif_init() expects an argument.</p></li>
+<li><p>configure.ac: Fix typo when testing for _OPENMP which caused the
+test to always pass.  Remove forced LIB_MATH=-lm.</p></li>
+</ul>
+</blockquote>
 <p>2023-11-28  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">