diff --git a/configure b/configure
index 03bf95a..2de3c8c 100755
--- a/configure
+++ b/configure
@@ -788,6 +788,9 @@
PANGO_DELEGATE_TRUE
PANGO_LIBS
PANGO_CFLAGS
+OPENJPEG_LIBS
+OPENJPEG_DELEGATE_FALSE
+OPENJPEG_DELEGATE_TRUE
OPENEXR_DELEGATE_FALSE
OPENEXR_DELEGATE_TRUE
OPENEXR_LIBS
@@ -1187,6 +1190,7 @@
with_lzma
with_mupdf
with_openexr
+with_openjpeg
with_pango
with_png
with_rsvg
@@ -1956,6 +1960,7 @@
--without-lzma disable LZMA support
--with-mupdf enable MUPDF support
--without-openexr disable OpenEXR support
+ --without-openjpeg disable OPENJPEG support
--without-pango disable PANGO support
--without-png disable PNG support
--with-rsvg enable RSVG support
@@ -3691,7 +3696,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=13992
+MAGICK_SVN_REVISION=14085:14090M
# Substitute library versioning
@@ -30645,6 +30650,117 @@
#
+# Check for OPENJPEG delegate library.
+#
+
+# Check whether --with-openjpeg was given.
+if test "${with_openjpeg+set}" = set; then :
+ withval=$with_openjpeg; with_openjpeg=$withval
+else
+ with_openjpeg='yes'
+fi
+
+
+if test "$with_openjpeg" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-openjpeg=$with_openjpeg "
+fi
+
+have_openjpeg='no'
+OPENJPEG_LIBS=''
+if test "$with_openjpeg" != 'no'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+$as_echo "-------------------------------------------------------------" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENJPEG" >&5
+$as_echo_n "checking for OPENJPEG... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ failed=0
+ passed=0
+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-1.5/openjpeg.h" "ac_cv_header_openjpeg_1_5_openjpeg_h" "$ac_includes_default"
+if test "x$ac_cv_header_openjpeg_1_5_openjpeg_h" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_setup_decoder in -lopenjpeg" >&5
+$as_echo_n "checking for opj_setup_decoder in -lopenjpeg... " >&6; }
+if ${ac_cv_lib_openjpeg_opj_setup_decoder+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lopenjpeg -lopenjpeg $FREETYPE_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opj_setup_decoder ();
+int
+main ()
+{
+return opj_setup_decoder ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_openjpeg_opj_setup_decoder=yes
+else
+ ac_cv_lib_openjpeg_opj_setup_decoder=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_setup_decoder" >&5
+$as_echo "$ac_cv_lib_openjpeg_opj_setup_decoder" >&6; }
+if test "x$ac_cv_lib_openjpeg_opj_setup_decoder" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OPENJPEG package is complete" >&5
+$as_echo_n "checking if OPENJPEG package is complete... " >&6; }
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+$as_echo "no -- some components failed test" >&6; }
+ have_openjpeg='no (failed tests)'
+ else
+ OPENJPEG_LIBS='-lopenjpeg'
+ LIBS="$OPENJPEG_LIBS $LIBS"
+
+$as_echo "#define OPENJPEG_DELEGATE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_openjpeg='yes'
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+ if test "$have_openjpeg" = 'yes'; then
+ OPENJPEG_DELEGATE_TRUE=
+ OPENJPEG_DELEGATE_FALSE='#'
+else
+ OPENJPEG_DELEGATE_TRUE='#'
+ OPENJPEG_DELEGATE_FALSE=
+fi
+
+
+
+
+
+#
# Check for PANGO delegate library.
#
@@ -35700,6 +35816,9 @@
if test "$have_openexr" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES openexr"
fi
+if test "$have_openjpeg" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES openjpeg"
+fi
if test "$have_pango" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES pango"
fi
@@ -35880,7 +35999,7 @@
if test "$build_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $OPENJPEG_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
@@ -36218,6 +36337,10 @@
as_fn_error $? "conditional \"OPENEXR_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${OPENJPEG_DELEGATE_TRUE}" && test -z "${OPENJPEG_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"OPENJPEG_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${PANGO_DELEGATE_TRUE}" && test -z "${PANGO_DELEGATE_FALSE}"; then
as_fn_error $? "conditional \"PANGO_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -38983,6 +39106,7 @@
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
MUPDF --with-mupdf=$with_mupdf $have_mupdf
OpenEXR --with-openexr=$with_openexr $have_openexr
+OpenJPEG --with-openjpeg=$with_openjpeg $have_openjpeg
PANGO --with-pango=$with_pango $have_pango
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png
@@ -39062,6 +39186,7 @@
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
MUPDF --with-mupdf=$with_mupdf $have_mupdf
OpenEXR --with-openexr=$with_openexr $have_openexr
+OpenJPEG --with-openjpeg=$with_openjpeg $have_openjpeg
PANGO --with-pango=$with_pango $have_pango
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png