Commit bfb610918 for imagemagick.org
commit bfb6109187a6776ee3dff4dde08fd9d7997d6036
Author: Cristy <urban-warrior@imagemagick.org>
Date: Fri Oct 2 18:25:00 2026 -0400
add dmr.h to header list
diff --git a/Makefile.in b/Makefile.in
index 7eacb9a7b..859878917 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -542,14 +542,14 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC
coders/cube.h coders/cut.c coders/cut.h coders/c2pa.c \
coders/c2pa.h coders/dcm.c coders/dcm.h coders/dds.c \
coders/dds.h coders/debug.c coders/debug.h coders/dib.c \
- coders/dib.h coders/djvu.h coders/dng.c coders/dng.h \
- coders/dot.c coders/dot.h coders/dps.h coders/dpx.c \
- coders/dpx.h coders/emf.h coders/ept.h coders/exr.h \
- coders/farbfeld.c coders/farbfeld.h coders/fax.c coders/fax.h \
- coders/fits.c coders/fits.h coders/fl32.c coders/fl32.h \
- coders/flif.h coders/fpx.h coders/ftxt.h coders/ftxt.c \
- coders/ghostscript-private.h coders/gif.c coders/gif.h \
- coders/gradient.c coders/gradient.h coders/gray.c \
+ coders/dib.h coders/djvu.h coders/dmr.h coders/dng.c \
+ coders/dng.h coders/dot.c coders/dot.h coders/dps.h \
+ coders/dpx.c coders/dpx.h coders/emf.h coders/ept.h \
+ coders/exr.h coders/farbfeld.c coders/farbfeld.h coders/fax.c \
+ coders/fax.h coders/fits.c coders/fits.h coders/fl32.c \
+ coders/fl32.h coders/flif.h coders/fpx.h coders/ftxt.h \
+ coders/ftxt.c coders/ghostscript-private.h coders/gif.c \
+ coders/gif.h coders/gradient.c coders/gradient.h coders/gray.c \
coders/gray.h coders/hald.c coders/hald.h coders/hdr.c \
coders/hdr.h coders/heic.h coders/histogram.c \
coders/histogram.h coders/hrz.c coders/hrz.h coders/html.c \
@@ -3906,6 +3906,7 @@ MAGICKCORE_CODER_SRCS = \
coders/dib.c \
coders/dib.h \
coders/djvu.h \
+ coders/dmr.h \
coders/dng.c \
coders/dng.h \
coders/dot.c \
@@ -4181,6 +4182,7 @@ CODERS_NOINST_HDRS = \
coders/debug.h \
coders/dib.h \
coders/djvu.h \
+ coders/dmr.h \
coders/dng.h \
coders/dot.h \
coders/dps.h \
diff --git a/coders/Makefile.am b/coders/Makefile.am
index 5f60b07c7..fb2400965 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -162,6 +162,7 @@ MAGICKCORE_CODER_SRCS = \
coders/dib.c \
coders/dib.h \
coders/djvu.h \
+ coders/dmr.h \
coders/dng.c \
coders/dng.h \
coders/dot.c \
@@ -437,6 +438,7 @@ CODERS_NOINST_HDRS = \
coders/debug.h \
coders/dib.h \
coders/djvu.h \
+ coders/dmr.h \
coders/dng.h \
coders/dot.h \
coders/dps.h \
diff --git a/configure b/configure
index 54c387f0b..2c05c5cba 100755
--- a/configure
+++ b/configure
@@ -4118,8 +4118,8 @@ ac_cxx_conftest_cxx11_main='
}
{
// Unicode literals
- char const *utf8 = u8"UTF-8 string \u2500";
- char16_t const *utf16 = u"UTF-8 string \u2500";
+ auto const *utf8 = u8"UTF-8 string \u2500";
+ char16_t const *utf16 = u"UTF-16 string \u2500";
char32_t const *utf32 = U"UTF-32 string \u2500";
}
'
@@ -5403,7 +5403,7 @@ MAGICK_PATCHLEVEL_VERSION=33
MAGICK_VERSION=7.1.2-33
-MAGICK_GIT_REVISION=ad98b244c:20260927
+MAGICK_GIT_REVISION=3e3f205d0:20261002
# Substitute library versioning
@@ -5437,7 +5437,7 @@ PACKAGE_LIB_VERSION=0x712
PACKAGE_LIB_VERSION_NUMBER=7,1,2,33
-PACKAGE_RELEASE_DATE=2026-09-27
+PACKAGE_RELEASE_DATE=2026-10-02
# Ensure that make can run correctly
@@ -12142,18 +12142,18 @@ then :
fi
if test "$enable_largefile,$enable_year2038" != no,no
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for large files" >&5
-printf %s "checking for $CPPFLAGS option for large files... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
+printf %s "checking for $CC option to enable large file support... " >&6; }
if test ${ac_cv_sys_largefile_opts+y}
then :
printf %s "(cached) " >&6
else case e in #(
- e) ac_save_CPPFLAGS=$CPPFLAGS
+ e) ac_save_CC="$CC"
ac_opt_found=no
- for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1"; do
+ for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
if test x"$ac_opt" != x"none needed"
then :
- CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
+ CC="$ac_save_CC $ac_opt"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12182,12 +12182,12 @@ then :
if test x"$ac_opt" = x"none needed"
then :
# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
- CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
+ CC="$CC -DFTYPE=ino_t"
if ac_fn_c_try_compile "$LINENO"
then :
else case e in #(
- e) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+ e) CC="$CC -D_FILE_OFFSET_BITS=64"
if ac_fn_c_try_compile "$LINENO"
then :
ac_opt='-D_FILE_OFFSET_BITS=64'
@@ -12203,7 +12203,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
test $ac_opt_found = no || break
done
- CPPFLAGS=$ac_save_CPPFLAGS
+ CC="$ac_save_CC"
test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
esac
@@ -12227,14 +12227,16 @@ printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
;; #(
+ "-n32") :
+ CC="$CC -n32" ;; #(
*) :
as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
esac
if test "$enable_year2038" != no
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for timestamps after 2038" >&5
-printf %s "checking for $CPPFLAGS option for timestamps after 2038... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
+printf %s "checking for $CC option for timestamps after 2038... " >&6; }
if test ${ac_cv_sys_year2038_opts+y}
then :
printf %s "(cached) " >&6