From: Cristy Date: Tue, 26 Apr 2016 05:41:09 +0000 (-0400) Subject: https://github.com/ImageMagick/ImageMagick/pull/175 X-Git-Tag: 7.0.1-0~19 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d2f14bcb7caf9d7c0ddc199e05d87eeb43a5cb0;p=imagemagick https://github.com/ImageMagick/ImageMagick/pull/175 --- diff --git a/Makefile.in b/Makefile.in index 1bbf61934..dc288171c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -522,11 +522,11 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC coders/viff.c coders/vips.c coders/wbmp.c coders/wpg.c \ coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c \ coders/xps.c coders/xtrn.c coders/ycbcr.c coders/yuv.c \ - coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \ - coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \ - coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \ - coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \ - filters/analyze.c + coders/dps.c coders/djvu.c coders/exr.c coders/flif.c \ + coders/fpx.c coders/clipboard.c coders/emf.c coders/jbig.c \ + coders/jpeg.c coders/jp2.c coders/png.c coders/ept.c \ + coders/tiff.c coders/webp.c coders/wmf.c coders/x.c \ + coders/xwd.c filters/analyze.c am__objects_1 = MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \ @@ -624,20 +624,21 @@ am__objects_1 = MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGI @DPS_DELEGATE_TRUE@am__objects_3 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dps.lo @DJVU_DELEGATE_TRUE@am__objects_4 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-djvu.lo @OPENEXR_DELEGATE_TRUE@am__objects_5 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-exr.lo -@FPX_DELEGATE_TRUE@am__objects_6 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo -@WINGDI32_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo \ +@FLIF_DELEGATE_TRUE@am__objects_6 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo +@FPX_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo +@WINGDI32_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo \ @WINGDI32_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo -@JBIG_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jbig.lo -@JPEG_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jpeg.lo -@LIBOPENJP2_DELEGATE_TRUE@am__objects_10 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jp2.lo -@PNG_DELEGATE_TRUE@am__objects_11 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-png.lo -@TIFF_DELEGATE_TRUE@am__objects_12 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ept.lo \ +@JBIG_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jbig.lo +@JPEG_DELEGATE_TRUE@am__objects_10 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jpeg.lo +@LIBOPENJP2_DELEGATE_TRUE@am__objects_11 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jp2.lo +@PNG_DELEGATE_TRUE@am__objects_12 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-png.lo +@TIFF_DELEGATE_TRUE@am__objects_13 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ept.lo \ @TIFF_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tiff.lo -@WEBP_DELEGATE_TRUE@am__objects_13 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-webp.lo -@WMF_DELEGATE_TRUE@am__objects_14 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wmf.lo -@X11_DELEGATE_TRUE@am__objects_15 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-x.lo \ +@WEBP_DELEGATE_TRUE@am__objects_14 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-webp.lo +@WMF_DELEGATE_TRUE@am__objects_15 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wmf.lo +@X11_DELEGATE_TRUE@am__objects_16 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-x.lo \ @X11_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xwd.lo -am__objects_16 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-aai.lo \ +am__objects_17 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-aai.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-art.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-avs.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-bgr.lo \ @@ -751,11 +752,11 @@ am__objects_16 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ $(am__objects_9) $(am__objects_10) $(am__objects_11) \ $(am__objects_12) $(am__objects_13) $(am__objects_14) \ - $(am__objects_15) -am__objects_17 = filters/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-analyze.lo + $(am__objects_15) $(am__objects_16) +am__objects_18 = filters/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-analyze.lo @WITH_MODULES_FALSE@am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = \ @WITH_MODULES_FALSE@ $(am__objects_1) $(am__objects_2) \ -@WITH_MODULES_FALSE@ $(am__objects_16) $(am__objects_17) +@WITH_MODULES_FALSE@ $(am__objects_17) $(am__objects_18) @WITH_MODULES_TRUE@am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = \ @WITH_MODULES_TRUE@ $(am__objects_1) $(am__objects_2) MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS) @@ -767,7 +768,7 @@ MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LINK = \ MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_DEPENDENCIES = \ $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_18 = MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ +am__objects_19 = MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-compare.lo \ MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-composite.lo \ MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-conjure.lo \ @@ -792,7 +793,7 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAG MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wandcli.lo \ MagickWand/MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wand-view.lo am_MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = \ - $(am__objects_18) + $(am__objects_19) MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS) MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LINK = \ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1024,6 +1025,15 @@ coders_fits_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_fits_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_fits_la_rpath = -rpath $(codersdir) +coders_flif_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +am_coders_flif_la_OBJECTS = coders/coders_flif_la-flif.lo +coders_flif_la_OBJECTS = $(am_coders_flif_la_OBJECTS) +coders_flif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(coders_flif_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +@FLIF_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_flif_la_rpath = \ +@FLIF_DELEGATE_TRUE@@WITH_MODULES_TRUE@ -rpath $(codersdir) coders_fpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_coders_fpx_la_OBJECTS = coders/coders_fpx_la-fpx.lo @@ -2009,56 +2019,56 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_ $(coders_dpx_la_SOURCES) $(coders_emf_la_SOURCES) \ $(coders_ept_la_SOURCES) $(coders_exr_la_SOURCES) \ $(coders_fax_la_SOURCES) $(coders_fd_la_SOURCES) \ - $(coders_fits_la_SOURCES) $(coders_fpx_la_SOURCES) \ - $(coders_gif_la_SOURCES) $(coders_gradient_la_SOURCES) \ - $(coders_gray_la_SOURCES) $(coders_hald_la_SOURCES) \ - $(coders_hdr_la_SOURCES) $(coders_histogram_la_SOURCES) \ - $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \ - $(coders_icon_la_SOURCES) $(coders_info_la_SOURCES) \ - $(coders_inline_la_SOURCES) $(coders_ipl_la_SOURCES) \ - $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \ - $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \ - $(coders_json_la_SOURCES) $(coders_label_la_SOURCES) \ - $(coders_mac_la_SOURCES) $(coders_magick_la_SOURCES) \ - $(coders_map_la_SOURCES) $(coders_mask_la_SOURCES) \ - $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \ - $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \ - $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \ - $(coders_mpeg_la_SOURCES) $(coders_mpr_la_SOURCES) \ - $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \ - $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \ - $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \ - $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \ - $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \ - $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \ - $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \ - $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ - $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ - $(coders_pnm_la_SOURCES) $(coders_ps_la_SOURCES) \ - $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \ - $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \ - $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \ - $(coders_rgf_la_SOURCES) $(coders_rla_la_SOURCES) \ - $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \ - $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \ - $(coders_sgi_la_SOURCES) $(coders_sixel_la_SOURCES) \ - $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \ - $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \ - $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \ - $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \ - $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \ - $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \ - $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \ - $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \ - $(coders_vips_la_SOURCES) $(coders_wbmp_la_SOURCES) \ - $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \ - $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \ - $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \ - $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \ - $(coders_xps_la_SOURCES) $(coders_xtrn_la_SOURCES) \ - $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ - $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \ - $(Magick___demo_analyze_SOURCES) \ + $(coders_fits_la_SOURCES) $(coders_flif_la_SOURCES) \ + $(coders_fpx_la_SOURCES) $(coders_gif_la_SOURCES) \ + $(coders_gradient_la_SOURCES) $(coders_gray_la_SOURCES) \ + $(coders_hald_la_SOURCES) $(coders_hdr_la_SOURCES) \ + $(coders_histogram_la_SOURCES) $(coders_hrz_la_SOURCES) \ + $(coders_html_la_SOURCES) $(coders_icon_la_SOURCES) \ + $(coders_info_la_SOURCES) $(coders_inline_la_SOURCES) \ + $(coders_ipl_la_SOURCES) $(coders_jbig_la_SOURCES) \ + $(coders_jnx_la_SOURCES) $(coders_jp2_la_SOURCES) \ + $(coders_jpeg_la_SOURCES) $(coders_json_la_SOURCES) \ + $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \ + $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \ + $(coders_mask_la_SOURCES) $(coders_mat_la_SOURCES) \ + $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \ + $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \ + $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \ + $(coders_mpr_la_SOURCES) $(coders_msl_la_SOURCES) \ + $(coders_mtv_la_SOURCES) $(coders_mvg_la_SOURCES) \ + $(coders_null_la_SOURCES) $(coders_otb_la_SOURCES) \ + $(coders_palm_la_SOURCES) $(coders_pango_la_SOURCES) \ + $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \ + $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \ + $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \ + $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \ + $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \ + $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \ + $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \ + $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \ + $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \ + $(coders_rgb_la_SOURCES) $(coders_rgf_la_SOURCES) \ + $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \ + $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \ + $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \ + $(coders_sixel_la_SOURCES) $(coders_stegano_la_SOURCES) \ + $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \ + $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \ + $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \ + $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \ + $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \ + $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \ + $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \ + $(coders_viff_la_SOURCES) $(coders_vips_la_SOURCES) \ + $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \ + $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \ + $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \ + $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \ + $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \ + $(coders_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \ + $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ + $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \ $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \ $(Magick___demo_gravity_SOURCES) \ @@ -2096,56 +2106,56 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF $(coders_dpx_la_SOURCES) $(coders_emf_la_SOURCES) \ $(coders_ept_la_SOURCES) $(coders_exr_la_SOURCES) \ $(coders_fax_la_SOURCES) $(coders_fd_la_SOURCES) \ - $(coders_fits_la_SOURCES) $(coders_fpx_la_SOURCES) \ - $(coders_gif_la_SOURCES) $(coders_gradient_la_SOURCES) \ - $(coders_gray_la_SOURCES) $(coders_hald_la_SOURCES) \ - $(coders_hdr_la_SOURCES) $(coders_histogram_la_SOURCES) \ - $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \ - $(coders_icon_la_SOURCES) $(coders_info_la_SOURCES) \ - $(coders_inline_la_SOURCES) $(coders_ipl_la_SOURCES) \ - $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \ - $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \ - $(coders_json_la_SOURCES) $(coders_label_la_SOURCES) \ - $(coders_mac_la_SOURCES) $(coders_magick_la_SOURCES) \ - $(coders_map_la_SOURCES) $(coders_mask_la_SOURCES) \ - $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \ - $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \ - $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \ - $(coders_mpeg_la_SOURCES) $(coders_mpr_la_SOURCES) \ - $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \ - $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \ - $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \ - $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \ - $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \ - $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \ - $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \ - $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ - $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ - $(coders_pnm_la_SOURCES) $(coders_ps_la_SOURCES) \ - $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \ - $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \ - $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \ - $(coders_rgf_la_SOURCES) $(coders_rla_la_SOURCES) \ - $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \ - $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \ - $(coders_sgi_la_SOURCES) $(coders_sixel_la_SOURCES) \ - $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \ - $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \ - $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \ - $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \ - $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \ - $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \ - $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \ - $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \ - $(coders_vips_la_SOURCES) $(coders_wbmp_la_SOURCES) \ - $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \ - $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \ - $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \ - $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \ - $(coders_xps_la_SOURCES) $(coders_xtrn_la_SOURCES) \ - $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ - $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \ - $(Magick___demo_analyze_SOURCES) \ + $(coders_fits_la_SOURCES) $(coders_flif_la_SOURCES) \ + $(coders_fpx_la_SOURCES) $(coders_gif_la_SOURCES) \ + $(coders_gradient_la_SOURCES) $(coders_gray_la_SOURCES) \ + $(coders_hald_la_SOURCES) $(coders_hdr_la_SOURCES) \ + $(coders_histogram_la_SOURCES) $(coders_hrz_la_SOURCES) \ + $(coders_html_la_SOURCES) $(coders_icon_la_SOURCES) \ + $(coders_info_la_SOURCES) $(coders_inline_la_SOURCES) \ + $(coders_ipl_la_SOURCES) $(coders_jbig_la_SOURCES) \ + $(coders_jnx_la_SOURCES) $(coders_jp2_la_SOURCES) \ + $(coders_jpeg_la_SOURCES) $(coders_json_la_SOURCES) \ + $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \ + $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \ + $(coders_mask_la_SOURCES) $(coders_mat_la_SOURCES) \ + $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \ + $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \ + $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \ + $(coders_mpr_la_SOURCES) $(coders_msl_la_SOURCES) \ + $(coders_mtv_la_SOURCES) $(coders_mvg_la_SOURCES) \ + $(coders_null_la_SOURCES) $(coders_otb_la_SOURCES) \ + $(coders_palm_la_SOURCES) $(coders_pango_la_SOURCES) \ + $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \ + $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \ + $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \ + $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \ + $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \ + $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \ + $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \ + $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \ + $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \ + $(coders_rgb_la_SOURCES) $(coders_rgf_la_SOURCES) \ + $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \ + $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \ + $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \ + $(coders_sixel_la_SOURCES) $(coders_stegano_la_SOURCES) \ + $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \ + $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \ + $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \ + $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \ + $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \ + $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \ + $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \ + $(coders_viff_la_SOURCES) $(coders_vips_la_SOURCES) \ + $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \ + $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \ + $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \ + $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \ + $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \ + $(coders_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \ + $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ + $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \ $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \ $(Magick___demo_gravity_SOURCES) \ @@ -2543,6 +2553,7 @@ FFTW_LIBS = @FFTW_LIBS@ FGREP = @FGREP@ FILTER_DIRNAME = @FILTER_DIRNAME@ FILTER_PATH = @FILTER_PATH@ +FLIF_LIBS = @FLIF_LIBS@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FPX_LIBS = @FPX_LIBS@ @@ -3067,6 +3078,8 @@ codersdir = $(CODER_PATH) @DJVU_DELEGATE_TRUE@MAGICKCORE_DJVU_SRCS = coders/djvu.c @OPENEXR_DELEGATE_TRUE@MAGICKCORE_EXR_MODULES = coders/exr.la @OPENEXR_DELEGATE_TRUE@MAGICKCORE_EXR_SRCS = coders/exr.c +@FLIF_DELEGATE_TRUE@MAGICKCORE_FLIF_MODULES = coders/flif.la +@FLIF_DELEGATE_TRUE@MAGICKCORE_FLIF_SRCS = coders/flif.c @FPX_DELEGATE_TRUE@MAGICKCORE_FPX_MODULES = coders/fpx.la @FPX_DELEGATE_TRUE@MAGICKCORE_FPX_SRCS = coders/fpx.c @JBIG_DELEGATE_TRUE@MAGICKCORE_JBIG_MODULES = coders/jbig.la @@ -3206,6 +3219,7 @@ MAGICKCORE_CODER_SRCS = \ $(MAGICKCORE_DPS_SRCS) \ $(MAGICKCORE_DJVU_SRCS) \ $(MAGICKCORE_EXR_SRCS) \ + $(MAGICKCORE_FLIF_SRCS) \ $(MAGICKCORE_FPX_SRCS) \ $(MAGICKCORE_GDI32_SRCS) \ $(MAGICKCORE_JBIG_SRCS) \ @@ -3331,6 +3345,7 @@ MAGICKCORE_CODER_SRCS = \ @WITH_MODULES_TRUE@ $(MAGICKCORE_DPS_MODULES) \ @WITH_MODULES_TRUE@ $(MAGICKCORE_DJVU_MODULES) \ @WITH_MODULES_TRUE@ $(MAGICKCORE_EXR_MODULES) \ +@WITH_MODULES_TRUE@ $(MAGICKCORE_FLIF_MODULES) \ @WITH_MODULES_TRUE@ $(MAGICKCORE_FPX_MODULES) \ @WITH_MODULES_TRUE@ $(MAGICKCORE_GDI32_MODULES) \ @WITH_MODULES_TRUE@ $(MAGICKCORE_JBIG_MODULES) \ @@ -3517,6 +3532,12 @@ coders_fits_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_fits_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_fits_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) +# FLIF coder module +coders_flif_la_SOURCES = coders/flif.c +coders_flif_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_flif_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_flif_la_LIBADD = $(MAGICKCORE_LIBS) $(FLIF_LIBS) + # FPX coder module coders_fpx_la_SOURCES = coders/fpx.c coders_fpx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) @@ -5955,6 +5976,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dj coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-exr.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo: \ @@ -6218,6 +6241,11 @@ coders/coders_fits_la-fits.lo: coders/$(am__dirstamp) \ coders/fits.la: $(coders_fits_la_OBJECTS) $(coders_fits_la_DEPENDENCIES) $(EXTRA_coders_fits_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_fits_la_LINK) $(am_coders_fits_la_rpath) $(coders_fits_la_OBJECTS) $(coders_fits_la_LIBADD) $(LIBS) +coders/coders_flif_la-flif.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) + +coders/flif.la: $(coders_flif_la_OBJECTS) $(coders_flif_la_DEPENDENCIES) $(EXTRA_coders_flif_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_flif_la_LINK) $(am_coders_flif_la_rpath) $(coders_flif_la_OBJECTS) $(coders_flif_la_LIBADD) $(LIBS) coders/coders_fpx_la-fpx.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -7207,6 +7235,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fits.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-gif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-gradient.Plo@am__quote@ @@ -7333,6 +7362,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_fax_la-fax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_fd_la-fd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_fits_la-fits.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_flif_la-flif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_fpx_la-fpx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_gif_la-gif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_gradient_la-gradient.Plo@am__quote@ @@ -8903,6 +8933,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ex @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-exr.lo `test -f 'coders/exr.c' || echo '$(srcdir)/'`coders/exr.c +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo: coders/flif.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo `test -f 'coders/flif.c' || echo '$(srcdir)/'`coders/flif.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/flif.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo `test -f 'coders/flif.c' || echo '$(srcdir)/'`coders/flif.c + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo: coders/fpx.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.Plo @@ -9372,6 +9409,13 @@ coders/coders_fits_la-fits.lo: coders/fits.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_fits_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_fits_la-fits.lo `test -f 'coders/fits.c' || echo '$(srcdir)/'`coders/fits.c +coders/coders_flif_la-flif.lo: coders/flif.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_flif_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_flif_la-flif.lo -MD -MP -MF coders/$(DEPDIR)/coders_flif_la-flif.Tpo -c -o coders/coders_flif_la-flif.lo `test -f 'coders/flif.c' || echo '$(srcdir)/'`coders/flif.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_flif_la-flif.Tpo coders/$(DEPDIR)/coders_flif_la-flif.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/flif.c' object='coders/coders_flif_la-flif.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_flif_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_flif_la-flif.lo `test -f 'coders/flif.c' || echo '$(srcdir)/'`coders/flif.c + coders/coders_fpx_la-fpx.lo: coders/fpx.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_fpx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_fpx_la-fpx.lo -MD -MP -MF coders/$(DEPDIR)/coders_fpx_la-fpx.Tpo -c -o coders/coders_fpx_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_fpx_la-fpx.Tpo coders/$(DEPDIR)/coders_fpx_la-fpx.Plo diff --git a/coders/Makefile.am b/coders/Makefile.am index 979325b0d..62ee2035c 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -32,6 +32,11 @@ MAGICKCORE_EXR_MODULES = coders/exr.la MAGICKCORE_EXR_SRCS = coders/exr.c endif +if FLIF_DELEGATE +MAGICKCORE_FLIF_MODULES = coders/flif.la +MAGICKCORE_FLIF_SRCS = coders/flif.c +endif + if FPX_DELEGATE MAGICKCORE_FPX_MODULES = coders/fpx.la MAGICKCORE_FPX_SRCS = coders/fpx.c @@ -201,6 +206,7 @@ MAGICKCORE_CODER_SRCS = \ $(MAGICKCORE_DPS_SRCS) \ $(MAGICKCORE_DJVU_SRCS) \ $(MAGICKCORE_EXR_SRCS) \ + $(MAGICKCORE_FLIF_SRCS) \ $(MAGICKCORE_FPX_SRCS) \ $(MAGICKCORE_GDI32_SRCS) \ $(MAGICKCORE_JBIG_SRCS) \ @@ -326,6 +332,7 @@ coders_LTLIBRARIES = \ $(MAGICKCORE_DPS_MODULES) \ $(MAGICKCORE_DJVU_MODULES) \ $(MAGICKCORE_EXR_MODULES) \ + $(MAGICKCORE_FLIF_MODULES) \ $(MAGICKCORE_FPX_MODULES) \ $(MAGICKCORE_GDI32_MODULES) \ $(MAGICKCORE_JBIG_MODULES) \ @@ -514,6 +521,12 @@ coders_fits_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_fits_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_fits_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) +# FLIF coder module +coders_flif_la_SOURCES = coders/flif.c +coders_flif_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_flif_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_flif_la_LIBADD = $(MAGICKCORE_LIBS) $(FLIF_LIBS) + # FPX coder module coders_fpx_la_SOURCES = coders/fpx.c coders_fpx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) diff --git a/config/config.h.in b/config/config.h.in index f8bced030..ad1361301 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -52,6 +52,9 @@ /* filter subdirectory. */ #undef FILTER_DIRNAME +/* Define if you have FLIF library */ +#undef FLIF_DELEGATE + /* Define if you have FONTCONFIG library */ #undef FONTCONFIG_DELEGATE diff --git a/configure b/configure index ddd454554..5ca507b82 100755 --- a/configure +++ b/configure @@ -851,6 +851,9 @@ ddjvuapi_CFLAGS FPX_LIBS FPX_DELEGATE_FALSE FPX_DELEGATE_TRUE +FLIF_LIBS +FLIF_DELEGATE_FALSE +FLIF_DELEGATE_TRUE FFTW_LIBS FFTW_CFLAGS FFTW_DELEGATE_FALSE @@ -1205,6 +1208,7 @@ with_autotrace with_dps with_dejavu_font_dir with_fftw +with_flif with_fpx with_djvu with_fontconfig @@ -2005,6 +2009,7 @@ Optional Packages: --with-dejavu-font-dir=DIR DejaVu font directory --without-fftw disable FFTW support + --without-flif disable FLIF support --without-fpx disable FlashPIX support --without-djvu disable DjVu support --without-fontconfig disable fontconfig support @@ -4523,7 +4528,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_GIT_REVISION=18040:4a8f724:20160424 +MAGICK_GIT_REVISION=18049:d5a34dc:20160426 # Substitute library versioning @@ -24501,7 +24506,7 @@ fi # Check additional headers -for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h utime.h wchar.h xlocale.h +for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -31215,6 +31220,116 @@ fi +# +# Check for FLIF delegate library. +# + +# Check whether --with-flif was given. +if test "${with_flif+set}" = set; then : + withval=$with_flif; with_flif=$withval +else + with_flif='yes' +fi + + +if test "$with_flif" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-flif=$with_flif " +fi + +have_flif='no' +FLIF_LIBS='' +if test "$with_flif" != 'no'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLIF" >&5 +$as_echo_n "checking for FLIF... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + failed=0 + passed=0 + ac_fn_c_check_header_mongrel "$LINENO" "flif.h" "ac_cv_header_flif_h" "$ac_includes_default" +if test "x$ac_cv_header_flif_h" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flif_create_decoder in -lflif" >&5 +$as_echo_n "checking for flif_create_decoder in -lflif... " >&6; } +if ${ac_cv_lib_flif_flif_create_decoder+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lflif $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 flif_create_decoder (); +int +main () +{ +return flif_create_decoder (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_flif_flif_create_decoder=yes +else + ac_cv_lib_flif_flif_create_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_flif_flif_create_decoder" >&5 +$as_echo "$ac_cv_lib_flif_flif_create_decoder" >&6; } +if test "x$ac_cv_lib_flif_flif_create_decoder" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FLIF package is complete" >&5 +$as_echo_n "checking if FLIF 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_flif='no (failed tests)' + else + FLIF_LIBS='-lflif' + LIBS="$FLIF_LIBS $LIBS" + +$as_echo "#define FLIF_DELEGATE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_flif='yes' + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + if test "$have_flif" = 'yes'; then + FLIF_DELEGATE_TRUE= + FLIF_DELEGATE_FALSE='#' +else + FLIF_DELEGATE_TRUE='#' + FLIF_DELEGATE_FALSE= +fi + + + + # # Check for FlashPIX delegate library. # @@ -37569,6 +37684,9 @@ fi if test "$have_fftw" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fftw" fi +if test "$have_flif" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES flif" +fi if test "$have_fpx" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fpx" fi @@ -37787,9 +37905,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_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 $JEMALLOC_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_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 $JEMALLOC_LIBS $THREAD_LIBS" else - MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_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 $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_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 $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" fi @@ -38088,6 +38206,10 @@ if test -z "${FFTW_DELEGATE_TRUE}" && test -z "${FFTW_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"FFTW_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${FLIF_DELEGATE_TRUE}" && test -z "${FLIF_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"FLIF_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${FPX_DELEGATE_TRUE}" && test -z "${FPX_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"FPX_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -40803,6 +40925,7 @@ matches your expectations. DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw + FLIF --with-flif=$with_flif $have_flif FlashPIX --with-fpx=$with_fpx $have_fpx FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig FreeType --with-freetype=$with_freetype $have_freetype @@ -40889,6 +41012,7 @@ matches your expectations. DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw + FLIF --with-flif=$with_flif $have_flif 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 1bff0f61c..f8302abba 100644 --- a/configure.ac +++ b/configure.ac @@ -1875,6 +1875,50 @@ AC_SUBST(FFTW_LIBS) dnl =========================================================================== +# +# Check for FLIF delegate library. +# +AC_ARG_WITH(flif, + [AC_HELP_STRING([--without-flif], + [disable FLIF support])], + [with_flif=$withval], + [with_flif='yes']) + +if test "$with_flif" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-flif=$with_flif " +fi + +have_flif='no' +FLIF_LIBS='' +if test "$with_flif" != 'no'; then + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING([for FLIF]) + AC_MSG_RESULT([]) + failed=0 + passed=0 + AC_CHECK_HEADER(flif.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_CHECK_LIB(flif,flif_create_decoder,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_MSG_CHECKING([if FLIF package is complete]) + if test $passed -gt 0; then + if test $failed -gt 0; then + AC_MSG_RESULT([no -- some components failed test]) + have_flif='no (failed tests)' + else + FLIF_LIBS='-lflif' + LIBS="$FLIF_LIBS $LIBS" + AC_DEFINE(FLIF_DELEGATE,1,Define if you have FLIF library) + AC_MSG_RESULT([yes]) + have_flif='yes' + fi + else + AC_MSG_RESULT([no]) + fi +fi +AM_CONDITIONAL(FLIF_DELEGATE,test "$have_flif" = 'yes') +AC_SUBST(FLIF_LIBS) + +dnl =========================================================================== + # # Check for FlashPIX delegate library. # @@ -3618,6 +3662,9 @@ fi if test "$have_fftw" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fftw" fi +if test "$have_flif" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES flif" +fi if test "$have_fpx" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fpx" fi @@ -3748,9 +3795,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_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 $JEMALLOC_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_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 $JEMALLOC_LIBS $THREAD_LIBS" else - MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_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 $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_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 $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" fi AC_SUBST(MAGICK_DEP_LIBS) @@ -3886,6 +3933,7 @@ matches your expectations. DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw + FLIF --with-flif=$with_flif $have_flif FlashPIX --with-fpx=$with_fpx $have_fpx FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig FreeType --with-freetype=$with_freetype $have_freetype