diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 37484c9..fe40079 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -77,6 +77,11 @@
#define MAGICKCORE_FILTER_DIRNAME "filters"
#endif
+/* Define if you have FITZ library */
+#ifndef MAGICKCORE_FITZ_DELEGATE
+#define MAGICKCORE_FITZ_DELEGATE 1
+#endif
+
/* Define if you have FONTCONFIG library */
#ifndef MAGICKCORE_FONTCONFIG_DELEGATE
#define MAGICKCORE_FONTCONFIG_DELEGATE 1
diff --git a/MagickCore/version.h b/MagickCore/version.h
index e85a890..1b745fb 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision "12914"
+#define MagickSVNRevision "12978M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
@@ -39,11 +39,11 @@
#define MagickppLibAddendum "-0"
#define MagickppLibInterface 2
#define MagickppLibMinInterface 2
-#define MagickReleaseDate "2013-08-06"
+#define MagickReleaseDate "2013-08-10"
#define MagickChangeDate "20120427"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "DPC HDRI OpenMP"
-#define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib"
+#define MagickDelegates "bzlib djvu fitz fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib"
#define MagickHomeURL "file:///usr/share/doc/ImageMagick-7/index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
#define MagickQuantumDepth "Q8"
diff --git a/Makefile.in b/Makefile.in
index 8b9a705..50108c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1755,7 +1755,8 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(coders_xpm_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_MODULES_TRUE@am_coders_xpm_la_rpath = -rpath $(codersdir)
-coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
+coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_coders_xps_la_OBJECTS = coders/coders_xps_la-xps.lo
coders_xps_la_OBJECTS = $(am_coders_xps_la_OBJECTS)
coders_xps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -2588,6 +2589,7 @@
FIGDecodeDelegate = @FIGDecodeDelegate@
FILTER_DIRNAME = @FILTER_DIRNAME@
FILTER_PATH = @FILTER_PATH@
+FITZ_LIBS = @FITZ_LIBS@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FPX_LIBS = @FPX_LIBS@
@@ -4053,7 +4055,7 @@
coders_xps_la_SOURCES = coders/xps.c
coders_xps_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
+coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(FITZ_LIBS) $(FREETYPE_LIBS)
# XWD coder module
coders_xwd_la_SOURCES = coders/xwd.c
diff --git a/coders/Makefile.am b/coders/Makefile.am
index 3af1cc2..1da7094 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -1032,7 +1032,7 @@
coders_xps_la_SOURCES = coders/xps.c
coders_xps_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
+coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(FITZ_LIBS) $(FREETYPE_LIBS)
# XWD coder module
coders_xwd_la_SOURCES = coders/xwd.c
diff --git a/config/config.h.in b/config/config.h.in
index 3561bdf..b934ea3 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -52,6 +52,9 @@
/* filter subdirectory. */
#undef FILTER_DIRNAME
+/* Define if you have FITZ library */
+#undef FITZ_DELEGATE
+
/* Define if you have FONTCONFIG library */
#undef FONTCONFIG_DELEGATE
diff --git a/configure b/configure
index d2c9a8b..e8080d8 100755
--- a/configure
+++ b/configure
@@ -821,6 +821,9 @@
GS_LIBS
GS_DELEGATE_FALSE
GS_DELEGATE_TRUE
+FITZ_LIBS
+FITZ_DELEGATE_FALSE
+FITZ_DELEGATE_TRUE
FREETYPE_DELEGATE_FALSE
FREETYPE_DELEGATE_TRUE
FREETYPE_LIBS
@@ -1173,6 +1176,7 @@
with_fpx
with_fontconfig
with_freetype
+with_fitz
with_gslib
with_fontpath
with_gs_font_dir
@@ -1941,6 +1945,7 @@
--without-fpx disable FlashPIX support
--without-fontconfig disable fontconfig support
--without-freetype disable Freetype support
+ --without-fitz disable FITZ support
--with-gslib enable Ghostscript library support
--with-fontpath=DIR prepend to default font search path
--with-gs-font-dir=DIR Ghostscript font directory
@@ -3688,7 +3693,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=12914
+MAGICK_SVN_REVISION=12978M
# Substitute library versioning
@@ -25959,7 +25964,7 @@
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
+ for dir in bzlib fftw fitz fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
@@ -25970,7 +25975,7 @@
done
# Libraries
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
+ for dir in bzlib fitz fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
@@ -28995,6 +29000,116 @@
#
+# Check for FITZ delegate library.
+#
+
+# Check whether --with-fitz was given.
+if test "${with_fitz+set}" = set; then :
+ withval=$with_fitz; with_fitz=$withval
+else
+ with_fitz='yes'
+fi
+
+
+if test "$with_fitz" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fitz=$with_fitz "
+fi
+
+have_fitz='no'
+FITZ_LIBS=''
+if test "$with_fitz" != 'no'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+$as_echo "-------------------------------------------------------------" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FITZ" >&5
+$as_echo_n "checking for FITZ... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ failed=0
+ passed=0
+ ac_fn_c_check_header_mongrel "$LINENO" "fitz.h" "ac_cv_header_fitz_h" "$ac_includes_default"
+if test "x$ac_cv_header_fitz_h" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fz_new_context in -lfitz" >&5
+$as_echo_n "checking for fz_new_context in -lfitz... " >&6; }
+if ${ac_cv_lib_fitz_fz_new_context+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfitz -lfitz $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 fz_new_context ();
+int
+main ()
+{
+return fz_new_context ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_fitz_fz_new_context=yes
+else
+ ac_cv_lib_fitz_fz_new_context=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_fitz_fz_new_context" >&5
+$as_echo "$ac_cv_lib_fitz_fz_new_context" >&6; }
+if test "x$ac_cv_lib_fitz_fz_new_context" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FITZ package is complete" >&5
+$as_echo_n "checking if FITZ 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_fitz='no (failed tests)'
+ else
+ FITZ_LIBS='-lfitz'
+ LIBS="$FITZ_LIBS $LIBS"
+
+$as_echo "#define FITZ_DELEGATE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_fitz='yes'
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+ if test "$have_fitz" = 'yes'; then
+ FITZ_DELEGATE_TRUE=
+ FITZ_DELEGATE_FALSE='#'
+else
+ FITZ_DELEGATE_TRUE='#'
+ FITZ_DELEGATE_FALSE=
+fi
+
+
+
+
+#
# Check for Ghostscript library or framework.
#
# Test for iapi.h & test for gsapi_new_instance in -lgs
@@ -35328,6 +35443,9 @@
if test "$have_ffmpeg" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
fi
+if test "$have_fitz" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fitz"
+fi
if test "$have_fftw" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
@@ -35851,6 +35969,10 @@
as_fn_error $? "conditional \"FREETYPE_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${FITZ_DELEGATE_TRUE}" && test -z "${FITZ_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"FITZ_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${GS_DELEGATE_TRUE}" && test -z "${GS_DELEGATE_FALSE}"; then
as_fn_error $? "conditional \"GS_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -38632,6 +38754,7 @@
DJVU --with-djvu=$with_djvu $have_djvu
DPS --with-dps=$with_dps $have_dps
FFTW --with-fftw=$with_fftw $have_fftw
+FITZ --with-fitz=$with_fitz $have_fitz
FlashPIX --with-fpx=$with_fpx $have_fpx
FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig
FreeType --with-freetype=$with_freetype $have_freetype
@@ -38710,6 +38833,7 @@
DJVU --with-djvu=$with_djvu $have_djvu
DPS --with-dps=$with_dps $have_dps
FFTW --with-fftw=$with_fftw $have_fftw
+FITZ --with-fitz=$with_fitz $have_fitz
FlashPIX --with-fpx=$with_fpx $have_fpx
FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig
FreeType --with-freetype=$with_freetype $have_freetype
diff --git a/configure.ac b/configure.ac
index 22d0ef8..5a061b8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1284,7 +1284,7 @@
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
+ for dir in bzlib fftw fitz fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
@@ -1295,7 +1295,7 @@
done
# Libraries
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
+ for dir in bzlib fitz fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
@@ -2007,6 +2007,50 @@
dnl ===========================================================================
#
+# Check for FITZ delegate library.
+#
+AC_ARG_WITH(fitz,
+ [AC_HELP_STRING([--without-fitz],
+ [disable FITZ support])],
+ [with_fitz=$withval],
+ [with_fitz='yes'])
+
+if test "$with_fitz" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fitz=$with_fitz "
+fi
+
+have_fitz='no'
+FITZ_LIBS=''
+if test "$with_fitz" != 'no'; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ AC_MSG_CHECKING([for FITZ])
+ AC_MSG_RESULT([])
+ failed=0
+ passed=0
+ AC_CHECK_HEADER(fitz.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(fitz,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lfitz $FREETYPE_LIBS)
+ AC_MSG_CHECKING([if FITZ package is complete])
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ AC_MSG_RESULT([no -- some components failed test])
+ have_fitz='no (failed tests)'
+ else
+ FITZ_LIBS='-lfitz'
+ LIBS="$FITZ_LIBS $LIBS"
+ AC_DEFINE(FITZ_DELEGATE,1,Define if you have FITZ library)
+ AC_MSG_RESULT([yes])
+ have_fitz='yes'
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AM_CONDITIONAL(FITZ_DELEGATE,test "$have_fitz" = 'yes')
+AC_SUBST(FITZ_LIBS)
+
+dnl ===========================================================================
+
+#
# Check for Ghostscript library or framework.
#
# Test for iapi.h & test for gsapi_new_instance in -lgs
@@ -3781,6 +3825,9 @@
if test "$have_ffmpeg" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
fi
+if test "$have_fitz" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fitz"
+fi
if test "$have_fftw" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
@@ -4017,6 +4064,7 @@
DJVU --with-djvu=$with_djvu $have_djvu
DPS --with-dps=$with_dps $have_dps
FFTW --with-fftw=$with_fftw $have_fftw
+FITZ --with-fitz=$with_fitz $have_fitz
FlashPIX --with-fpx=$with_fpx $have_fpx
FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig
FreeType --with-freetype=$with_freetype $have_freetype