From: Cristy Date: Sun, 25 Nov 2018 14:56:18 +0000 (-0500) Subject: Add framework to support the Cube LUT image format X-Git-Tag: 7.0.8-15~33 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccc1640ed3fbbdc6f5f15e27e12b17faa4aa7bc8;p=imagemagick Add framework to support the Cube LUT image format --- diff --git a/MagickCore/static.h b/MagickCore/static.h index 5a432399f..72df93efb 100644 --- a/MagickCore/static.h +++ b/MagickCore/static.h @@ -48,6 +48,7 @@ extern ModuleExport size_t RegisterCLIPImage(void), RegisterCLIPBOARDImage(void), RegisterCMYKImage(void), + RegisterCUBEImage(void), RegisterCUTImage(void), RegisterDCMImage(void), RegisterDCXImage(void), @@ -211,6 +212,7 @@ extern ModuleExport void UnregisterCLIPImage(void), UnregisterCLIPBOARDImage(void), UnregisterCMYKImage(void), + UnregisterCUBEImage(void), UnregisterCUTImage(void), UnregisterDCMImage(void), UnregisterDCXImage(void), diff --git a/Makefile.in b/Makefile.in index 720056ff0..f460650cb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -521,36 +521,36 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC MagickCore/nt-base.c coders/aai.c coders/art.c coders/avs.c \ coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \ coders/caption.c coders/cin.c coders/cip.c coders/clip.c \ - coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \ - coders/debug.c coders/dib.c coders/dng.c coders/dot.c \ - coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \ - coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \ - coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \ - coders/info.c coders/inline.c coders/ipl.c coders/jnx.c \ - coders/json.c coders/label.c coders/mac.c coders/magick.c \ - coders/map.c coders/mask.c coders/mat.c coders/matte.c \ - coders/meta.c coders/miff.c coders/mono.c coders/mpc.c \ - coders/mpeg.c coders/mpr.c coders/msl.c coders/mtv.c \ - coders/mvg.c coders/null.c coders/otb.c coders/palm.c \ - coders/pango.c coders/pattern.c coders/pcd.c coders/pcl.c \ - coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \ - coders/pgx.c coders/pict.c coders/pix.c coders/plasma.c \ - coders/pnm.c coders/ps.c coders/ps2.c coders/ps3.c \ - coders/psd.c coders/psd-private.h coders/pwp.c coders/raw.c \ - coders/rgb.c coders/rgf.c coders/rla.c coders/rle.c \ - coders/scr.c coders/screenshot.c coders/sct.c coders/sfw.c \ - coders/sgi.c coders/sixel.c coders/stegano.c coders/sun.c \ - coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \ - coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \ - coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \ - 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/flif.c \ - coders/fpx.c coders/clipboard.c coders/emf.c coders/heic.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/cmyk.c coders/cube.c coders/cut.c coders/dcm.c \ + coders/dds.c coders/debug.c coders/dib.c coders/dng.c \ + coders/dot.c coders/dpx.c coders/fax.c coders/fits.c \ + coders/gif.c coders/gradient.c coders/gray.c coders/hald.c \ + coders/hdr.c coders/histogram.c coders/hrz.c coders/html.c \ + coders/icon.c coders/info.c coders/inline.c coders/ipl.c \ + coders/jnx.c coders/json.c coders/label.c coders/mac.c \ + coders/magick.c coders/map.c coders/mask.c coders/mat.c \ + coders/matte.c coders/meta.c coders/miff.c coders/mono.c \ + coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \ + coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \ + coders/palm.c coders/pango.c coders/pattern.c coders/pcd.c \ + coders/pcl.c coders/pcx.c coders/pdb.c coders/pdf.c \ + coders/pes.c coders/pgx.c coders/pict.c coders/pix.c \ + coders/plasma.c coders/pnm.c coders/ps.c coders/ps2.c \ + coders/ps3.c coders/psd.c coders/psd-private.h coders/pwp.c \ + coders/raw.c coders/rgb.c coders/rgf.c coders/rla.c \ + coders/rle.c coders/scr.c coders/screenshot.c coders/sct.c \ + coders/sfw.c coders/sgi.c coders/sixel.c coders/stegano.c \ + coders/sun.c coders/svg.c coders/tga.c coders/thumbnail.c \ + coders/tile.c coders/tim.c coders/ttf.c coders/txt.c \ + coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c \ + coders/vid.c 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/flif.c coders/fpx.c coders/clipboard.c coders/emf.c \ + coders/heic.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/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \ @@ -675,6 +675,7 @@ am__objects_18 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cip.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.lo \ + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dds.lo \ @@ -925,6 +926,14 @@ coders_cmyk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_cmyk_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_cmyk_la_rpath = -rpath $(codersdir) +coders_cube_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +am_coders_cube_la_OBJECTS = coders/cube_la-cube.lo +coders_cube_la_OBJECTS = $(am_coders_cube_la_OBJECTS) +coders_cube_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(coders_cube_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +@WITH_MODULES_TRUE@am_coders_cube_la_rpath = -rpath $(codersdir) coders_cut_la_DEPENDENCIES = $(MAGICKCORE_LIBS) am_coders_cut_la_OBJECTS = coders/cut_la-cut.lo coders_cut_la_OBJECTS = $(am_coders_cut_la_OBJECTS) @@ -2159,6 +2168,7 @@ am__depfiles_remade = Magick++/demo/$(DEPDIR)/analyze-analyze.Po \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.Plo \ + coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dds.Plo \ @@ -2287,6 +2297,7 @@ am__depfiles_remade = Magick++/demo/$(DEPDIR)/analyze-analyze.Po \ coders/$(DEPDIR)/clip_la-clip.Plo \ coders/$(DEPDIR)/clipboard_la-clipboard.Plo \ coders/$(DEPDIR)/cmyk_la-cmyk.Plo \ + coders/$(DEPDIR)/cube_la-cube.Plo \ coders/$(DEPDIR)/cut_la-cut.Plo \ coders/$(DEPDIR)/dcm_la-dcm.Plo \ coders/$(DEPDIR)/dds_la-dds.Plo \ @@ -2451,65 +2462,65 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_ $(coders_cals_la_SOURCES) $(coders_caption_la_SOURCES) \ $(coders_cin_la_SOURCES) $(coders_cip_la_SOURCES) \ $(coders_clip_la_SOURCES) $(coders_clipboard_la_SOURCES) \ - $(coders_cmyk_la_SOURCES) $(coders_cut_la_SOURCES) \ - $(coders_dcm_la_SOURCES) $(coders_dds_la_SOURCES) \ - $(coders_debug_la_SOURCES) $(coders_dib_la_SOURCES) \ - $(coders_djvu_la_SOURCES) $(coders_dng_la_SOURCES) \ - $(coders_dot_la_SOURCES) $(coders_dps_la_SOURCES) \ - $(coders_dpx_la_SOURCES) $(coders_emf_la_SOURCES) \ - $(coders_ept_la_SOURCES) $(coders_exr_la_SOURCES) \ - $(coders_fax_la_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_heic_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_pgx_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_cmyk_la_SOURCES) $(coders_cube_la_SOURCES) \ + $(coders_cut_la_SOURCES) $(coders_dcm_la_SOURCES) \ + $(coders_dds_la_SOURCES) $(coders_debug_la_SOURCES) \ + $(coders_dib_la_SOURCES) $(coders_djvu_la_SOURCES) \ + $(coders_dng_la_SOURCES) $(coders_dot_la_SOURCES) \ + $(coders_dps_la_SOURCES) $(coders_dpx_la_SOURCES) \ + $(coders_emf_la_SOURCES) $(coders_ept_la_SOURCES) \ + $(coders_exr_la_SOURCES) $(coders_fax_la_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_heic_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_pgx_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) \ @@ -2539,65 +2550,65 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF $(coders_cals_la_SOURCES) $(coders_caption_la_SOURCES) \ $(coders_cin_la_SOURCES) $(coders_cip_la_SOURCES) \ $(coders_clip_la_SOURCES) $(coders_clipboard_la_SOURCES) \ - $(coders_cmyk_la_SOURCES) $(coders_cut_la_SOURCES) \ - $(coders_dcm_la_SOURCES) $(coders_dds_la_SOURCES) \ - $(coders_debug_la_SOURCES) $(coders_dib_la_SOURCES) \ - $(coders_djvu_la_SOURCES) $(coders_dng_la_SOURCES) \ - $(coders_dot_la_SOURCES) $(coders_dps_la_SOURCES) \ - $(coders_dpx_la_SOURCES) $(coders_emf_la_SOURCES) \ - $(coders_ept_la_SOURCES) $(coders_exr_la_SOURCES) \ - $(coders_fax_la_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_heic_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_pgx_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_cmyk_la_SOURCES) $(coders_cube_la_SOURCES) \ + $(coders_cut_la_SOURCES) $(coders_dcm_la_SOURCES) \ + $(coders_dds_la_SOURCES) $(coders_debug_la_SOURCES) \ + $(coders_dib_la_SOURCES) $(coders_djvu_la_SOURCES) \ + $(coders_dng_la_SOURCES) $(coders_dot_la_SOURCES) \ + $(coders_dps_la_SOURCES) $(coders_dpx_la_SOURCES) \ + $(coders_emf_la_SOURCES) $(coders_ept_la_SOURCES) \ + $(coders_exr_la_SOURCES) $(coders_fax_la_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_heic_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_pgx_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) \ @@ -3564,6 +3575,7 @@ MAGICKCORE_CODER_SRCS = \ coders/cip.c \ coders/clip.c \ coders/cmyk.c \ + coders/cube.c \ coders/cut.c \ coders/dcm.c \ coders/dds.c \ @@ -3696,6 +3708,7 @@ CODERS_NOINST_HDRS = \ coders/coders.h \ coders/coders-list.h \ coders/coders-private.h \ + coders/cube.h \ coders/cut.h \ coders/dcm.h \ coders/dds.h \ @@ -3827,6 +3840,7 @@ CODERS_NOINST_HDRS = \ @WITH_MODULES_TRUE@ coders/cip.la \ @WITH_MODULES_TRUE@ coders/clip.la \ @WITH_MODULES_TRUE@ coders/cmyk.la \ +@WITH_MODULES_TRUE@ coders/cube.la \ @WITH_MODULES_TRUE@ coders/cut.la \ @WITH_MODULES_TRUE@ coders/dcm.la \ @WITH_MODULES_TRUE@ coders/dds.la \ @@ -4019,6 +4033,12 @@ coders_cmyk_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_cmyk_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_cmyk_la_LIBADD = $(MAGICKCORE_LIBS) +# CUBE coder module +coders_cube_la_SOURCES = coders/cube.c +coders_cube_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_cube_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_cube_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) + # CUT coder module coders_cut_la_SOURCES = coders/cut.c coders_cut_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) @@ -6436,6 +6456,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cl coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.lo: \ @@ -6825,6 +6847,11 @@ coders/cmyk_la-cmyk.lo: coders/$(am__dirstamp) \ coders/cmyk.la: $(coders_cmyk_la_OBJECTS) $(coders_cmyk_la_DEPENDENCIES) $(EXTRA_coders_cmyk_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_cmyk_la_LINK) $(am_coders_cmyk_la_rpath) $(coders_cmyk_la_OBJECTS) $(coders_cmyk_la_LIBADD) $(LIBS) +coders/cube_la-cube.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) + +coders/cube.la: $(coders_cube_la_OBJECTS) $(coders_cube_la_DEPENDENCIES) $(EXTRA_coders_cube_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_cube_la_LINK) $(am_coders_cube_la_rpath) $(coders_cube_la_OBJECTS) $(coders_cube_la_LIBADD) $(LIBS) coders/cut_la-cut.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -7824,6 +7851,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dds.Plo@am__quote@ # am--include-marker @@ -7952,6 +7980,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/clip_la-clip.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/clipboard_la-clipboard.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/cmyk_la-cmyk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/cube_la-cube.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/cut_la-cut.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/dcm_la-dcm.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/dds_la-dds.Plo@am__quote@ # am--include-marker @@ -8839,6 +8868,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cm @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-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.lo: coders/cube.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-cube.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.lo `test -f 'coders/cube.c' || echo '$(srcdir)/'`coders/cube.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/cube.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.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-cube.lo `test -f 'coders/cube.c' || echo '$(srcdir)/'`coders/cube.c + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.lo: coders/cut.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-cut.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Plo @@ -9917,6 +9953,13 @@ coders/cmyk_la-cmyk.lo: coders/cmyk.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_cmyk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/cmyk_la-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c +coders/cube_la-cube.lo: coders/cube.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_cube_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/cube_la-cube.lo -MD -MP -MF coders/$(DEPDIR)/cube_la-cube.Tpo -c -o coders/cube_la-cube.lo `test -f 'coders/cube.c' || echo '$(srcdir)/'`coders/cube.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/cube_la-cube.Tpo coders/$(DEPDIR)/cube_la-cube.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/cube.c' object='coders/cube_la-cube.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_cube_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/cube_la-cube.lo `test -f 'coders/cube.c' || echo '$(srcdir)/'`coders/cube.c + coders/cut_la-cut.lo: coders/cut.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_cut_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/cut_la-cut.lo -MD -MP -MF coders/$(DEPDIR)/cut_la-cut.Tpo -c -o coders/cut_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/cut_la-cut.Tpo coders/$(DEPDIR)/cut_la-cut.Plo @@ -12171,6 +12214,7 @@ distclean: distclean-am -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.Plo + -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dds.Plo @@ -12299,6 +12343,7 @@ distclean: distclean-am -rm -f coders/$(DEPDIR)/clip_la-clip.Plo -rm -f coders/$(DEPDIR)/clipboard_la-clipboard.Plo -rm -f coders/$(DEPDIR)/cmyk_la-cmyk.Plo + -rm -f coders/$(DEPDIR)/cube_la-cube.Plo -rm -f coders/$(DEPDIR)/cut_la-cut.Plo -rm -f coders/$(DEPDIR)/dcm_la-dcm.Plo -rm -f coders/$(DEPDIR)/dds_la-dds.Plo @@ -12646,6 +12691,7 @@ maintainer-clean: maintainer-clean-am -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.Plo + -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cut.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dcm.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-dds.Plo @@ -12774,6 +12820,7 @@ maintainer-clean: maintainer-clean-am -rm -f coders/$(DEPDIR)/clip_la-clip.Plo -rm -f coders/$(DEPDIR)/clipboard_la-clipboard.Plo -rm -f coders/$(DEPDIR)/cmyk_la-cmyk.Plo + -rm -f coders/$(DEPDIR)/cube_la-cube.Plo -rm -f coders/$(DEPDIR)/cut_la-cut.Plo -rm -f coders/$(DEPDIR)/dcm_la-dcm.Plo -rm -f coders/$(DEPDIR)/dds_la-dds.Plo diff --git a/coders/Makefile.am b/coders/Makefile.am index 116c661a2..d34e65351 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -109,6 +109,7 @@ MAGICKCORE_CODER_SRCS = \ coders/cip.c \ coders/clip.c \ coders/cmyk.c \ + coders/cube.c \ coders/cut.c \ coders/dcm.c \ coders/dds.c \ @@ -241,6 +242,7 @@ CODERS_NOINST_HDRS = \ coders/coders.h \ coders/coders-list.h \ coders/coders-private.h \ + coders/cube.h \ coders/cut.h \ coders/dcm.h \ coders/dds.h \ @@ -372,6 +374,7 @@ coders_LTLIBRARIES = \ coders/cip.la \ coders/clip.la \ coders/cmyk.la \ + coders/cube.la \ coders/cut.la \ coders/dcm.la \ coders/dds.la \ @@ -566,6 +569,12 @@ coders_cmyk_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_cmyk_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_cmyk_la_LIBADD = $(MAGICKCORE_LIBS) +# CUBE coder module +coders_cube_la_SOURCES = coders/cube.c +coders_cube_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_cube_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_cube_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) + # CUT coder module coders_cut_la_SOURCES = coders/cut.c coders_cut_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) diff --git a/coders/coders.h b/coders/coders.h index 5345f5d54..65bcec400 100644 --- a/coders/coders.h +++ b/coders/coders.h @@ -34,6 +34,7 @@ #endif #include "coders/clip.h" #include "coders/cmyk.h" +#include "coders/cube.h" #include "coders/cut.h" #include "coders/dcm.h" #include "coders/dds.h" diff --git a/coders/cube.c b/coders/cube.c new file mode 100644 index 000000000..e84f9c80f --- /dev/null +++ b/coders/cube.c @@ -0,0 +1,277 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% CCCC U U BBBB EEEEE % +% C U U B B E % +% C U U BBBB EEE % +% C U U B B E % +% CCCC UUU BBBB EEEEE % +% % +% % +% Cube LUT Image Format % +% % +% Software Design % +% Cristy % +% July 2018 % +% % +% % +% Copyright 1999-2018 ImageMagick Studio LLC, a non-profit organization % +% dedicated to making software imaging solutions freely available. % +% % +% You may not use this file except in compliance with the License. You may % +% obtain a copy of the License at % +% % +% https://imagemagick.org/script/license.php % +% % +% Unless required by applicable law or agreed to in writing, software % +% distributed under the License is distributed on an "AS IS" BASIS, % +% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. % +% See the License for the specific language governing permissions and % +% limitations under the License. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +*/ + +/* + Include declarations. +*/ +#include "MagickCore/studio.h" +#include "MagickCore/blob.h" +#include "MagickCore/blob-private.h" +#include "MagickCore/cache.h" +#include "MagickCore/colorspace.h" +#include "MagickCore/exception.h" +#include "MagickCore/exception-private.h" +#include "MagickCore/image.h" +#include "MagickCore/image-private.h" +#include "MagickCore/list.h" +#include "MagickCore/magick.h" +#include "MagickCore/memory_.h" +#include "MagickCore/module.h" +#include "MagickCore/monitor.h" +#include "MagickCore/monitor-private.h" +#include "MagickCore/pixel-accessor.h" +#include "MagickCore/quantum-private.h" +#include "MagickCore/resource_.h" +#include "MagickCore/static.h" +#include "MagickCore/string_.h" +#include "MagickCore/string-private.h" +#include "MagickCore/thread-private.h" +^L +/* + Forward declarations. +*/ +static MagickBooleanType + WriteCUBEImage(const ImageInfo *,Image *,ExceptionInfo *); + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e a d H A L D I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ReadCUBEImage() creates a Cube color lookup table image and returns it. It +% allocates the memory necessary for the new Image structure and returns a +% pointer to the new image. +% +% The format of the ReadCUBEImage method is: +% +% Image *ReadCUBEImage(const ImageInfo *image_info, +% ExceptionInfo *exception) +% +% A description of each parameter follows: +% +% o image_info: the image info. +% +% o exception: return any errors or warnings in this structure. +% +*/ +static Image *ReadCUBEImage(const ImageInfo *image_info, + ExceptionInfo *exception) +{ + Image + *image; + + MagickBooleanType + status; + + size_t + cube_size, + level; + + ssize_t + y; + + /* + Create CUBE color lookup table image. + */ + assert(image_info != (const ImageInfo *) NULL); + assert(image_info->signature == MagickCoreSignature); + if (image_info->debug != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); + assert(exception != (ExceptionInfo *) NULL); + assert(exception->signature == MagickCoreSignature); + image=AcquireImage(image_info,exception); + level=0; + if (*image_info->filename != '\0') + level=StringToUnsignedLong(image_info->filename); + if (level < 2) + level=8; + status=MagickTrue; + cube_size=level*level; + image->columns=(size_t) (level*cube_size); + image->rows=(size_t) (level*cube_size); + status=SetImageExtent(image,image->columns,image->rows,exception); + if (status == MagickFalse) + return(DestroyImageList(image)); + for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) level) + { + ssize_t + blue, + green, + red; + + register Quantum + *magick_restrict q; + + if (status == MagickFalse) + continue; + q=QueueAuthenticPixels(image,0,y,image->columns,(size_t) level,exception); + if (q == (Quantum *) NULL) + { + status=MagickFalse; + continue; + } + blue=y/(ssize_t) level; + for (green=0; green < (ssize_t) cube_size; green++) + { + for (red=0; red < (ssize_t) cube_size; red++) + { + SetPixelRed(image,ClampToQuantum(QuantumRange*red/(cube_size-1.0)),q); + SetPixelGreen(image,ClampToQuantum(QuantumRange*green/(cube_size-1.0)), + q); + SetPixelBlue(image,ClampToQuantum(QuantumRange*blue/(cube_size-1.0)),q); + SetPixelAlpha(image,OpaqueAlpha,q); + q+=GetPixelChannels(image); + } + } + if (SyncAuthenticPixels(image,exception) == MagickFalse) + status=MagickFalse; + } + return(GetFirstImageInList(image)); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e g i s t e r H A L D I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% RegisterCUBEImage() adds attributes for the Hald color lookup table image +% format to the list of supported formats. The attributes include the image +% format tag, a method to read and/or write the format, whether the format +% supports the saving of more than one frame to the same file or blob, whether +% the format supports native in-memory I/O, and a brief description of the +% format. +% +% The format of the RegisterCUBEImage method is: +% +% size_t RegisterCUBEImage(void) +% +*/ +ModuleExport size_t RegisterCUBEImage(void) +{ + MagickInfo + *entry; + + entry=AcquireMagickInfo("CUBE","CUBE", + "Identity Cube color lookup table image"); + entry->decoder=(DecodeImageHandler *) ReadCUBEImage; + entry->encoder=(EncodeImageHandler *) WriteCUBEImage; + entry->flags^=CoderAdjoinFlag; + entry->format_type=ImplicitFormatType; + entry->flags|=CoderRawSupportFlag; + entry->flags|=CoderEndianSupportFlag; + (void) RegisterMagickInfo(entry); + return(MagickImageCoderSignature); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% U n r e g i s t e r H A L D I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% UnregisterCUBEImage() removes format registrations made by the +% CUBE module from the list of supported formats. +% +% The format of the UnregisterCUBEImage method is: +% +% UnregisterCUBEImage(void) +% +*/ +ModuleExport void UnregisterCUBEImage(void) +{ + (void) UnregisterMagickInfo("CUBE"); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% W r i t e C U B E I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% WriteCUBEImage an image in the Cube coloe lookup table image format. +% +% The format of the WriteCUBEImage method is: +% +% MagickBooleanType WriteCUBEImage(const ImageInfo *image_info, +% Image *image,ExceptionInfo *exception) +% +% A description of each parameter follows. +% +% o image_info: the image info. +% +% o image: The image. +% +% o exception: return any errors or warnings in this structure. +% +*/ +static MagickBooleanType WriteCUBEImage(const ImageInfo *image_info, + Image *image,ExceptionInfo *exception) +{ + assert(image_info != (const ImageInfo *) NULL); + assert(image_info->signature == MagickCoreSignature); + assert(image != (Image *) NULL); + assert(image->signature == MagickCoreSignature); + assert(exception != (ExceptionInfo *) NULL); + (void) exception; + if (image->debug != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + return(MagickTrue); +} diff --git a/coders/cube.h b/coders/cube.h new file mode 100644 index 000000000..c865fe923 --- /dev/null +++ b/coders/cube.h @@ -0,0 +1,31 @@ +/* + Copyright 1999-2018 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. + + You may not use this file except in compliance with the License. + obtain a copy of the License at + + https://imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "coders/coders-private.h" + +#define MagickCUBEHeaders + +#define MagickCUBEAliases + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +MagickCoderExports(CUBE) + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif diff --git a/configure b/configure index 6f899ddb8..2a17a88cf 100755 --- a/configure +++ b/configure @@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=15 MAGICK_VERSION=7.0.8-15 -MAGICK_GIT_REVISION=15016:55a7a6ac4:20181124 +MAGICK_GIT_REVISION=15026:03507b81f:20181125 # Substitute library versioning