From: cristy Date: Sun, 19 Dec 2010 02:32:11 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8381 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbb0ef09b2b4265f02a5bc591f7cccabfda54951;p=imagemagick --- diff --git a/Install-unix.txt b/Install-unix.txt index bd59e0589..cc999c4ca 100644 --- a/Install-unix.txt +++ b/Install-unix.txt @@ -401,6 +401,9 @@ Configure --without-lcms disable LCMS support. + --without-lzma + disable LZMA support. + --without-png disable PNG support. diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 5e1a7efdb..ff445b6a9 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -55,7 +55,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index 0eb4362c2..cd0416657 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -222,6 +222,7 @@ namespace Magick using MagickCore::FaxCompression; using MagickCore::Group4Compression; using MagickCore::JPEGCompression; + using MagickCore::LZMACompression; using MagickCore::LZWCompression; using MagickCore::RLECompression; using MagickCore::ZipCompression; diff --git a/Makefile.in b/Makefile.in index 4a147c3aa..2e40fab03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -504,7 +504,8 @@ coders_dib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(coders_dib_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_dib_la_rpath = -rpath $(codersdir) coders_djvu_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_djvu_la_OBJECTS = coders/coders_djvu_la-djvu.lo coders_djvu_la_OBJECTS = $(am_coders_djvu_la_OBJECTS) coders_djvu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -728,7 +729,7 @@ coders_map_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(coders_map_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_map_la_rpath = -rpath $(codersdir) coders_mat_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_mat_la_OBJECTS = coders/coders_mat_la-mat.lo coders_mat_la_OBJECTS = $(am_coders_mat_la_OBJECTS) coders_mat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -752,7 +753,7 @@ coders_meta_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $@ @WITH_MODULES_TRUE@am_coders_meta_la_rpath = -rpath $(codersdir) coders_miff_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_miff_la_OBJECTS = coders/coders_miff_la-miff.lo coders_miff_la_OBJECTS = $(am_coders_miff_la_OBJECTS) coders_miff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -791,7 +792,8 @@ coders_mpr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(coders_mpr_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_mpr_la_rpath = -rpath $(codersdir) coders_msl_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_msl_la_OBJECTS = coders/coders_msl_la-msl.lo coders_msl_la_OBJECTS = $(am_coders_msl_la_OBJECTS) coders_msl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -873,7 +875,8 @@ coders_pdb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_MODULES_TRUE@am_coders_pdb_la_rpath = -rpath $(codersdir) coders_pdf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_pdf_la_OBJECTS = coders/coders_pdf_la-pdf.lo coders_pdf_la_OBJECTS = $(am_coders_pdf_la_OBJECTS) coders_pdf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -913,7 +916,7 @@ coders_plasma_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_MODULES_TRUE@am_coders_plasma_la_rpath = -rpath $(codersdir) coders_png_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_png_la_OBJECTS = coders/coders_png_la-png.lo coders_png_la_OBJECTS = $(am_coders_png_la_OBJECTS) coders_png_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -946,7 +949,7 @@ coders_ps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_MODULES_TRUE@am_coders_ps_la_rpath = -rpath $(codersdir) coders_ps2_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_ps2_la_OBJECTS = coders/coders_ps2_la-ps2.lo coders_ps2_la_OBJECTS = $(am_coders_ps2_la_OBJECTS) coders_ps2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -955,7 +958,7 @@ coders_ps2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_MODULES_TRUE@am_coders_ps2_la_rpath = -rpath $(codersdir) coders_ps3_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_ps3_la_OBJECTS = coders/coders_ps3_la-ps3.lo coders_ps3_la_OBJECTS = $(am_coders_ps3_la_OBJECTS) coders_ps3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1050,7 +1053,7 @@ coders_sun_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_svg_la_OBJECTS = coders/coders_svg_la-svg.lo coders_svg_la_OBJECTS = $(am_coders_svg_la_OBJECTS) coders_svg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1075,7 +1078,7 @@ coders_thumbnail_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_MODULES_TRUE@am_coders_thumbnail_la_rpath = -rpath $(codersdir) coders_tiff_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_tiff_la_OBJECTS = coders/coders_tiff_la-tiff.lo coders_tiff_la_OBJECTS = $(am_coders_tiff_la_OBJECTS) coders_tiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1121,7 +1124,8 @@ coders_uil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(coders_uil_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_uil_la_rpath = -rpath $(codersdir) coders_url_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_url_la_OBJECTS = coders/coders_url_la-url.lo coders_url_la_OBJECTS = $(am_coders_url_la_OBJECTS) coders_url_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -2354,6 +2358,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ +LZMA_LIBS = @LZMA_LIBS@ LZWDecodeDelegate = @LZWDecodeDelegate@ LZWEncodeDelegate = @LZWEncodeDelegate@ LaunchDelegate = @LaunchDelegate@ @@ -3145,7 +3150,7 @@ coders_dib_la_LIBADD = $(MAGICKCORE_LIBS) coders_djvu_la_SOURCES = coders/djvu.c coders_djvu_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_djvu_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) +coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) # DNG coder module coders_dng_la_SOURCES = coders/dng.c @@ -3313,7 +3318,7 @@ coders_map_la_LIBADD = $(MAGICKCORE_LIBS) coders_mat_la_SOURCES = coders/mat.c coders_mat_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_mat_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # MATTE coder module coders_matte_la_SOURCES = coders/matte.c @@ -3331,7 +3336,7 @@ coders_meta_la_LIBADD = $(MAGICKCORE_LIBS) coders_miff_la_SOURCES = coders/miff.c coders_miff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_miff_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_miff_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(BZLIB_LIBS) +coders_miff_la_LIBADD = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(BZLIB_LIBS) # MONO coder module coders_mono_la_SOURCES = coders/mono.c @@ -3361,7 +3366,7 @@ coders_mpr_la_LIBADD = $(MAGICKCORE_LIBS) coders_msl_la_SOURCES = coders/msl.c coders_msl_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_msl_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # MTV coder module coders_mtv_la_SOURCES = coders/mtv.c @@ -3427,7 +3432,7 @@ coders_pdb_la_LIBADD = $(MAGICKCORE_LIBS) coders_pdf_la_SOURCES = coders/pdf.c coders_pdf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) +coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) # PES coder module coders_pes_la_SOURCES = coders/pes.c @@ -3451,7 +3456,7 @@ coders_pix_la_LIBADD = $(MAGICKCORE_LIBS) coders_png_la_SOURCES = coders/png.c coders_png_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_png_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PLASMA coder module coders_plasma_la_SOURCES = coders/plasma.c @@ -3481,13 +3486,13 @@ coders_ps_la_LIBADD = $(MAGICKCORE_LIBS) $(GS_LIBS) $(MATH_LIBS) coders_ps2_la_SOURCES = coders/ps2.c coders_ps2_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_ps2_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PS3 coder module coders_ps3_la_SOURCES = coders/ps3.c coders_ps3_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_ps3_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PSD coder module coders_psd_la_SOURCES = coders/psd.c @@ -3565,7 +3570,7 @@ coders_scr_la_LIBADD = $(MAGICKCORE_LIBS) coders_svg_la_SOURCES = coders/svg.c coders_svg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS) coders_svg_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # TGA coder module coders_tga_la_SOURCES = coders/tga.c @@ -3583,7 +3588,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS) coders_tiff_la_SOURCES = coders/tiff.c coders_tiff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) +coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) # TILE coder module coders_tile_la_SOURCES = coders/tile.c @@ -3619,7 +3624,7 @@ coders_uil_la_LIBADD = $(MAGICKCORE_LIBS) coders_url_la_SOURCES = coders/url.c coders_url_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_url_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # UYVY coder module coders_uyvy_la_SOURCES = coders/uyvy.c diff --git a/coders/Makefile.am b/coders/Makefile.am index 72b36807d..6f16fb6c4 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -411,7 +411,7 @@ coders_dib_la_LIBADD = $(MAGICKCORE_LIBS) coders_djvu_la_SOURCES = coders/djvu.c coders_djvu_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_djvu_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) +coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) # DNG coder module coders_dng_la_SOURCES = coders/dng.c @@ -579,7 +579,7 @@ coders_map_la_LIBADD = $(MAGICKCORE_LIBS) coders_mat_la_SOURCES = coders/mat.c coders_mat_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_mat_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # MATTE coder module coders_matte_la_SOURCES = coders/matte.c @@ -597,7 +597,7 @@ coders_meta_la_LIBADD = $(MAGICKCORE_LIBS) coders_miff_la_SOURCES = coders/miff.c coders_miff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_miff_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_miff_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(BZLIB_LIBS) +coders_miff_la_LIBADD = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(BZLIB_LIBS) # MONO coder module coders_mono_la_SOURCES = coders/mono.c @@ -627,7 +627,7 @@ coders_mpr_la_LIBADD = $(MAGICKCORE_LIBS) coders_msl_la_SOURCES = coders/msl.c coders_msl_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_msl_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # MTV coder module coders_mtv_la_SOURCES = coders/mtv.c @@ -693,7 +693,7 @@ coders_pdb_la_LIBADD = $(MAGICKCORE_LIBS) coders_pdf_la_SOURCES = coders/pdf.c coders_pdf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) +coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) # PES coder module coders_pes_la_SOURCES = coders/pes.c @@ -717,7 +717,7 @@ coders_pix_la_LIBADD = $(MAGICKCORE_LIBS) coders_png_la_SOURCES = coders/png.c coders_png_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_png_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PLASMA coder module coders_plasma_la_SOURCES = coders/plasma.c @@ -747,13 +747,13 @@ coders_ps_la_LIBADD = $(MAGICKCORE_LIBS) $(GS_LIBS) $(MATH_LIBS) coders_ps2_la_SOURCES = coders/ps2.c coders_ps2_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_ps2_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PS3 coder module coders_ps3_la_SOURCES = coders/ps3.c coders_ps3_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_ps3_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PSD coder module coders_psd_la_SOURCES = coders/psd.c @@ -831,7 +831,7 @@ coders_scr_la_LIBADD = $(MAGICKCORE_LIBS) coders_svg_la_SOURCES = coders/svg.c coders_svg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS) coders_svg_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # TGA coder module coders_tga_la_SOURCES = coders/tga.c @@ -849,7 +849,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS) coders_tiff_la_SOURCES = coders/tiff.c coders_tiff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) +coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) # TILE coder module coders_tile_la_SOURCES = coders/tile.c @@ -885,7 +885,7 @@ coders_uil_la_LIBADD = $(MAGICKCORE_LIBS) coders_url_la_SOURCES = coders/url.c coders_url_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_url_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) +coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # UYVY coder module coders_uyvy_la_SOURCES = coders/uyvy.c diff --git a/coders/tiff.c b/coders/tiff.c index 77b331d83..46e3b9f38 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -1031,6 +1031,9 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, break; } case COMPRESSION_OJPEG: image->compression=JPEGCompression; break; +#if defined(COMPRESSION_LZMA) + case COMPRESSION_LZMA: image->compression=LZMACompression; break; +#endif case COMPRESSION_LZW: image->compression=LZWCompression; break; case COMPRESSION_DEFLATE: image->compression=ZipCompression; break; case COMPRESSION_ADOBE_DEFLATE: image->compression=ZipCompression; break; @@ -2547,6 +2550,13 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, compress_tag=COMPRESSION_JPEG; break; } +#if defined(COMPRESSION_LZMA) + case LZMACompression: + { + compress_tag=COMPRESSION_LZMA; + break; + } +#endif case LZWCompression: { compress_tag=COMPRESSION_LZW; @@ -2589,6 +2599,9 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, #if defined(YCBCR_SUPPORT) && defined(JPEG_SUPPORT) case COMPRESSION_JPEG: #endif +#if defined(LZMA_SUPPORT) && defined(COMPRESSION_LZMA) + case COMPRESSION_LZMA: +#endif #if defined(LZW_SUPPORT) case COMPRESSION_LZW: #endif @@ -2625,6 +2638,22 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, (void) SetImageDepth(image,8); break; } +#if defined(COMPRESSION_LZMA) + case COMPRESSION_LZMA: + { + uint32 + quality; + + quality=image_info->quality/10; + if (quality < 1) + quality=1; + else + if (quality > 9) + quality=9; + (void) TIFFSetField(tiff,TIFFTAG_LZMAPRESET,quality); + break; + } +#endif default: break; } diff --git a/config/config.h.in b/config/config.h.in index c99fc41ca..604346030 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -745,6 +745,9 @@ */ #undef LT_OBJDIR +/* Define if you have lzma compression library */ +#undef LZMA_DELEGATE + /* Define to prepend to default font search path. */ #undef MAGICK_FONT_PATH diff --git a/config/configure.xml b/config/configure.xml index 45f4f2224..d88fb3543 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + @@ -20,13 +20,13 @@ - + - + diff --git a/config/delegates.xml b/config/delegates.xml index be53c6fcf..b9bfd976b 100644 --- a/config/delegates.xml +++ b/config/delegates.xml @@ -80,7 +80,7 @@ - + diff --git a/configure b/configure index d3188871a..c89bdf0b4 100755 --- a/configure +++ b/configure @@ -749,6 +749,9 @@ OPENEXR_DELEGATE_FALSE OPENEXR_DELEGATE_TRUE OPENEXR_LIBS OPENEXR_CFLAGS +LZMA_LIBS +LZMA_DELEGATE_FALSE +LZMA_DELEGATE_TRUE LQR_DELEGATE_FALSE LQR_DELEGATE_TRUE LQR_LIBS @@ -1112,6 +1115,7 @@ with_jp2 with_lcms with_lcms2 with_lqr +with_lzma with_openexr with_png with_rsvg @@ -1858,6 +1862,7 @@ Optional Packages: --without-lcms disable lcms (v1.1X) support --without-lcms2 disable lcms (v2.X) support --without-lqr disable Liquid Rescale support + --without-lzma disable LZMA support --without-openexr disable OpenEXR support --without-png disable PNG support --without-rsvg disable RSVG support @@ -19982,7 +19987,7 @@ $as_echo "#define LTDL_DELEGATE 1" >>confdefs.h fi # Enable build using delegate libraries built in subdirectories rather than installed -# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib) +# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib) # Check whether --enable-delegate-build was given. if test "${enable_delegate_build+set}" = set; then : enableval=$enable_delegate_build; enable_delegate_build=$enableval @@ -24047,7 +24052,7 @@ if test "$enable_delegate_build" != 'no'; then # 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 magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do + 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 wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -24058,7 +24063,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do + 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 wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else @@ -28228,6 +28233,116 @@ fi +# Disable LZMA (lzma library) + +# Check whether --with-lzma was given. +if test "${with_lzma+set}" = set; then : + withval=$with_lzma; with_lzma=$withval +else + with_lzma='yes' +fi + +if test "$with_lzma" != 'yes' ; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma " +fi + +# +# Check for LZMA +# +have_lzma='no' +LZMA_LIBS='' +if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5 +$as_echo_n "checking for LZMA... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + failed=0 + passed=0 + ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" +if test "x$ac_cv_header_lzma_h" = x""yes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 +$as_echo_n "checking for lzma_code in -llzma... " >&6; } +if test "${ac_cv_lib_lzma_lzma_code+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llzma $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 lzma_code (); +int +main () +{ +return lzma_code (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lzma_lzma_code=yes +else + ac_cv_lib_lzma_lzma_code=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_lzma_lzma_code" >&5 +$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; } +if test "x$ac_cv_lib_lzma_lzma_code" = x""yes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if LZMA package is complete" >&5 +$as_echo_n "checking if LZMA 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_lzma='no (failed tests)' + else + LZMA_LIBS='-llzma' + LIBS="$LZMA_LIBS $LIBS" + +$as_echo "#define LZMA_DELEGATE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lzma='yes' + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + if test "$have_lzma" = 'yes'; then + LZMA_DELEGATE_TRUE= + LZMA_DELEGATE_FALSE='#' +else + LZMA_DELEGATE_TRUE='#' + LZMA_DELEGATE_FALSE= +fi + + + + # # Check for the OpenEXR delegate library. # @@ -32366,6 +32481,7 @@ if test "$have_jp2" = 'yes'; then DELEGATES="$DELEGATES jp2"; fi if test "$have_lcms2" = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi if test "$have_lcms" = 'yes'; then DELEGATES="$DELEGATES lcms"; fi if test "$have_lqr" = 'yes'; then DELEGATES="$DELEGATES lqr"; fi +if test "$have_lzma" = 'yes'; then DELEGATES="$DELEGATES lzma"; fi if test "$have_ffmpeg" = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi if test "$have_openexr" = 'yes'; then DELEGATES="$DELEGATES openexr"; fi if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi @@ -32522,9 +32638,9 @@ fi if test "$with_modules" != 'no'; then - MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" fi @@ -32852,6 +32968,10 @@ if test -z "${LQR_DELEGATE_TRUE}" && test -z "${LQR_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"LQR_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LZMA_DELEGATE_TRUE}" && test -z "${LZMA_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"LZMA_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${OPENEXR_DELEGATE_TRUE}" && test -z "${OPENEXR_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"OPENEXR_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -35611,6 +35731,7 @@ JPEG-2000 --with-jp2=$with_jp2 $have_jp2 LCMS v1 --with-lcms=$with_lcms $have_lcms LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2 LQR --with-lqr=$with_lqr $have_lqr +LZMA --with-lzma=$with_lzma $have_lzma Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus OpenEXR --with-openexr=$with_openexr $have_openexr PERL --with-perl=$with_perl $have_perl @@ -35684,6 +35805,7 @@ JPEG-2000 --with-jp2=$with_jp2 $have_jp2 LCMS v1 --with-lcms=$with_lcms $have_lcms LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2 LQR --with-lqr=$with_lqr $have_lqr +LZMA --with-lzma=$with_lzma $have_lzma Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus OpenEXR --with-openexr=$with_openexr $have_openexr PERL --with-perl=$with_perl $have_perl diff --git a/configure.ac b/configure.ac index a49f0ef1b..15c7fd434 100755 --- a/configure.ac +++ b/configure.ac @@ -510,7 +510,7 @@ if test "$with_ltdl" != 'no'; then fi # Enable build using delegate libraries built in subdirectories rather than installed -# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib) +# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib) AC_ARG_ENABLE([delegate-build], [AC_HELP_STRING([--enable-delegate-build], [look for delegate libraries in build directory])], @@ -1101,7 +1101,7 @@ if test "$enable_delegate_build" != 'no'; then # 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 magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do + 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 wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -1112,7 +1112,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do + 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 wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else @@ -2276,6 +2276,49 @@ AC_SUBST(LQR_LIBS) dnl =========================================================================== +# Disable LZMA (lzma library) +AC_ARG_WITH(lzma, + [ --without-lzma disable LZMA support], + [with_lzma=$withval], + [with_lzma='yes']) +if test "$with_lzma" != 'yes' ; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma " +fi + +# +# Check for LZMA +# +have_lzma='no' +LZMA_LIBS='' +if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING(for LZMA) + AC_MSG_RESULT() + failed=0 + passed=0 + AC_CHECK_HEADER(lzma.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) + AC_CHECK_LIB(lzma,lzma_code,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_MSG_CHECKING(if LZMA package is complete) + if test $passed -gt 0; then + if test $failed -gt 0; then + AC_MSG_RESULT(no -- some components failed test) + have_lzma='no (failed tests)' + else + LZMA_LIBS='-llzma' + LIBS="$LZMA_LIBS $LIBS" + AC_DEFINE(LZMA_DELEGATE,1,Define if you have lzma compression library) + AC_MSG_RESULT(yes) + have_lzma='yes' + fi + else + AC_MSG_RESULT(no) + fi +fi +AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes') +AC_SUBST(LZMA_LIBS) + +dnl =========================================================================== + # # Check for the OpenEXR delegate library. # @@ -3321,6 +3364,7 @@ if test "$have_jp2" = 'yes'; then DELEGATES="$DELEGATES jp2"; fi if test "$have_lcms2" = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi if test "$have_lcms" = 'yes'; then DELEGATES="$DELEGATES lcms"; fi if test "$have_lqr" = 'yes'; then DELEGATES="$DELEGATES lqr"; fi +if test "$have_lzma" = 'yes'; then DELEGATES="$DELEGATES lzma"; fi if test "$have_ffmpeg" = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi if test "$have_openexr" = 'yes'; then DELEGATES="$DELEGATES openexr"; fi if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi @@ -3389,9 +3433,9 @@ AC_SUBST(MAGICK_LIBLTDL) AC_SUBST(MAGICK_LTDLDEPS) if test "$with_modules" != 'no'; then - MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" fi AC_SUBST(MAGICK_DEP_LIBS) @@ -3508,6 +3552,7 @@ JPEG-2000 --with-jp2=$with_jp2 $have_jp2 LCMS v1 --with-lcms=$with_lcms $have_lcms LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2 LQR --with-lqr=$with_lqr $have_lqr +LZMA --with-lzma=$with_lzma $have_lzma Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus OpenEXR --with-openexr=$with_openexr $have_openexr PERL --with-perl=$with_perl $have_perl diff --git a/magick/Magick-config b/magick/Magick-config index 72df5abe9..36b374324 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/magick/compress.h b/magick/compress.h index 3294ad875..41ca4e3fb 100644 --- a/magick/compress.h +++ b/magick/compress.h @@ -42,7 +42,8 @@ typedef enum PizCompression, Pxr24Compression, B44Compression, - B44ACompression + B44ACompression, + LZMACompression } CompressionType; typedef struct _Ascii85Info diff --git a/magick/magick-config.h b/magick/magick-config.h index 234f58a03..7dd17d6b8 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -1124,6 +1124,11 @@ #define MAGICKCORE_LT_OBJDIR ".libs/" #endif +/* Define if you have lzma compression library */ +#ifndef MAGICKCORE_LZMA_DELEGATE +#define MAGICKCORE_LZMA_DELEGATE 1 +#endif + /* Define to prepend to default font search path. */ /* #undef MAGICK_FONT_PATH */ diff --git a/magick/option.c b/magick/option.c index 24b659491..e9f60f527 100644 --- a/magick/option.c +++ b/magick/option.c @@ -782,6 +782,7 @@ static const OptionInfo { "JPEG2000", (ssize_t) JPEG2000Compression, MagickFalse }, { "Lossless", (ssize_t) LosslessJPEGCompression, MagickFalse }, { "LosslessJPEG", (ssize_t) LosslessJPEGCompression, MagickFalse }, + { "LZMA", (ssize_t) LZMACompression, MagickFalse }, { "LZW", (ssize_t) LZWCompression, MagickFalse }, { "None", (ssize_t) NoCompression, MagickFalse }, { "Piz", (ssize_t) PizCompression, MagickFalse }, diff --git a/magick/version.h b/magick/version.h index 3f25bd47d..101da627a 100644 --- a/magick/version.h +++ b/magick/version.h @@ -33,8 +33,8 @@ extern "C" { #define MagickLibAddendum "-6" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2010-12-12" -#define MagickChangeDate "20101210" +#define MagickReleaseDate "2010-12-18" +#define MagickChangeDate "20101217" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/wand/Wand-config b/wand/Wand-config index 05a13b5e6..879e98203 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2