GraphicsMagick: 3 new changesets
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.284.1642206492.1623.graphicsmagick-commit@lists.sourceforge.net> |
changeset 9164b6c0f0a6 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=9164b6c0f0a6
summary: Added minimal reader for heif image format
changeset 1aece932bb29 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=1aece932bb29
summary: Merge heif
changeset b87ad3d9b35b in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=b87ad3d9b35b
summary: Close Heif branch
diffstat:
Makefile.in | 236 +++++++++++++++++-----------
README.txt | 6 +
coders/Makefile.am | 16 +-
coders/heif.c | 373 ++++++++++++++++++++++++++++++++++++++++++++++
configure | 129 +++++++++++++++-
configure.ac | 51 ++++++-
magick/magick_config.h.in | 3 +
magick/module_aliases.h | 1 +
magick/static.c | 3 +
magick/static.h | 2 +
magick/symbols.h | 2 +
11 files changed, 725 insertions(+), 97 deletions(-)
diffs (truncated from 1233 to 500 lines):
diff -r 48c9416cca66 -r b87ad3d9b35b Makefile.in
--- a/Makefile.in Mon May 10 11:16:24 2021 -0500
+++ b/Makefile.in Fri Jan 14 18:12:58 2022 -0600
@@ -225,8 +225,8 @@
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -522,6 +522,15 @@
$(AM_CFLAGS) $(CFLAGS) $(coders_gray_la_LDFLAGS) $(LDFLAGS) -o \
$@
@WITH_MODULES_TRUE@am_coders_gray_la_rpath = -rpath $(codersdir)
+coders_heif_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1)
+am_coders_heif_la_OBJECTS = coders/heif_la-heif.lo
+coders_heif_la_OBJECTS = $(am_coders_heif_la_OBJECTS)
+coders_heif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(coders_heif_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+@HasHEIF_TRUE@@WITH_MODULES_TRUE@am_coders_heif_la_rpath = -rpath \
+@HasHEIF_TRUE@@WITH_MODULES_TRUE@ $(codersdir)
coders_histogram_la_DEPENDENCIES = $(LIBMAGICK)
am_coders_histogram_la_OBJECTS = coders/histogram_la-histogram.lo
coders_histogram_la_OBJECTS = $(am_coders_histogram_la_OBJECTS)
@@ -1219,7 +1228,7 @@
coders/psd.c coders/dps.c coders/clipboard.c coders/emf.c \
coders/fpx.c coders/jbig.c coders/jnx.c coders/jpeg.c \
coders/jp2.c coders/ept.c coders/tiff.c coders/x.c \
- coders/xwd.c coders/webp.c filters/analyze.c
+ coders/xwd.c coders/webp.c coders/heif.c filters/analyze.c
@HasX11_TRUE@am__objects_1 = magick/libGraphicsMagick_la-animate.lo \
@HasX11_TRUE@ magick/libGraphicsMagick_la-display.lo \
@HasX11_TRUE@ magick/libGraphicsMagick_la-PreRvIcccm.lo \
@@ -1325,7 +1334,9 @@
@HasX11_TRUE@ coders/magick_libGraphicsMagick_la-xwd.lo
@HasWEBP_TRUE@am__objects_14 = \
@HasWEBP_TRUE@ coders/magick_libGraphicsMagick_la-webp.lo
-am__objects_15 = $(am__objects_4) \
+@HasHEIF_TRUE@am__objects_15 = \
+@HasHEIF_TRUE@ coders/magick_libGraphicsMagick_la-heif.lo
+am__objects_16 = $(am__objects_4) \
coders/magick_libGraphicsMagick_la-art.lo \
coders/magick_libGraphicsMagick_la-avs.lo \
coders/magick_libGraphicsMagick_la-bmp.lo \
@@ -1414,11 +1425,12 @@
coders/magick_libGraphicsMagick_la-yuv.lo $(am__objects_5) \
$(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_16 = filters/magick_libGraphicsMagick_la-analyze.lo
+ $(am__objects_12) $(am__objects_13) $(am__objects_14) \
+ $(am__objects_15)
+am__objects_17 = filters/magick_libGraphicsMagick_la-analyze.lo
@WITH_MODULES_FALSE@am_magick_libGraphicsMagick_la_OBJECTS = \
@WITH_MODULES_FALSE@ $(am__objects_2) $(am__objects_3) \
-@WITH_MODULES_FALSE@ $(am__objects_15) $(am__objects_16)
+@WITH_MODULES_FALSE@ $(am__objects_16) $(am__objects_17)
@WITH_MODULES_TRUE@am_magick_libGraphicsMagick_la_OBJECTS = \
@WITH_MODULES_TRUE@ $(am__objects_2) $(am__objects_3)
magick_libGraphicsMagick_la_OBJECTS = \
@@ -1429,11 +1441,11 @@
$(LDFLAGS) -o $@
wand_libGraphicsMagickWand_la_DEPENDENCIES = $(LIBMAGICK) \
$(am__DEPENDENCIES_1)
-am__objects_17 = wand/libGraphicsMagickWand_la-drawing_wand.lo \
+am__objects_18 = wand/libGraphicsMagickWand_la-drawing_wand.lo \
wand/libGraphicsMagickWand_la-magick_compat.lo \
wand/libGraphicsMagickWand_la-magick_wand.lo \
wand/libGraphicsMagickWand_la-pixel_wand.lo
-am_wand_libGraphicsMagickWand_la_OBJECTS = $(am__objects_17)
+am_wand_libGraphicsMagickWand_la_OBJECTS = $(am__objects_18)
wand_libGraphicsMagickWand_la_OBJECTS = \
$(am_wand_libGraphicsMagickWand_la_OBJECTS)
wand_libGraphicsMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1644,6 +1656,7 @@
coders/$(DEPDIR)/gif_la-gif.Plo \
coders/$(DEPDIR)/gradient_la-gradient.Plo \
coders/$(DEPDIR)/gray_la-gray.Plo \
+ coders/$(DEPDIR)/heif_la-heif.Plo \
coders/$(DEPDIR)/histogram_la-histogram.Plo \
coders/$(DEPDIR)/hrz_la-hrz.Plo \
coders/$(DEPDIR)/html_la-html.Plo \
@@ -1681,6 +1694,7 @@
coders/$(DEPDIR)/magick_libGraphicsMagick_la-gif.Plo \
coders/$(DEPDIR)/magick_libGraphicsMagick_la-gradient.Plo \
coders/$(DEPDIR)/magick_libGraphicsMagick_la-gray.Plo \
+ coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Plo \
coders/$(DEPDIR)/magick_libGraphicsMagick_la-histogram.Plo \
coders/$(DEPDIR)/magick_libGraphicsMagick_la-hrz.Plo \
coders/$(DEPDIR)/magick_libGraphicsMagick_la-html.Plo \
@@ -1965,46 +1979,47 @@
$(coders_ept_la_SOURCES) $(coders_fax_la_SOURCES) \
$(coders_fits_la_SOURCES) $(coders_fpx_la_SOURCES) \
$(coders_gif_la_SOURCES) $(coders_gradient_la_SOURCES) \
- $(coders_gray_la_SOURCES) $(coders_histogram_la_SOURCES) \
- $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \
- $(coders_icon_la_SOURCES) $(coders_identity_la_SOURCES) \
- $(coders_info_la_SOURCES) $(coders_jbig_la_SOURCES) \
- $(coders_jnx_la_SOURCES) $(coders_jp2_la_SOURCES) \
- $(coders_jpeg_la_SOURCES) $(coders_label_la_SOURCES) \
- $(coders_locale_la_SOURCES) $(coders_logo_la_SOURCES) \
- $(coders_mac_la_SOURCES) $(coders_map_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_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
- $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
- $(coders_pdf_la_SOURCES) $(coders_pict_la_SOURCES) \
- $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
- $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
- $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
- $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
- $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
- $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
- $(coders_rle_la_SOURCES) $(coders_sct_la_SOURCES) \
- $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
- $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
- $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
- $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
- $(coders_tim_la_SOURCES) $(coders_topol_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_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_xwd_la_SOURCES) \
- $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
+ $(coders_gray_la_SOURCES) $(coders_heif_la_SOURCES) \
+ $(coders_histogram_la_SOURCES) $(coders_hrz_la_SOURCES) \
+ $(coders_html_la_SOURCES) $(coders_icon_la_SOURCES) \
+ $(coders_identity_la_SOURCES) $(coders_info_la_SOURCES) \
+ $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \
+ $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \
+ $(coders_label_la_SOURCES) $(coders_locale_la_SOURCES) \
+ $(coders_logo_la_SOURCES) $(coders_mac_la_SOURCES) \
+ $(coders_map_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_pcd_la_SOURCES) \
+ $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \
+ $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \
+ $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+ $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+ $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+ $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+ $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+ $(coders_pwp_la_SOURCES) $(coders_rgb_la_SOURCES) \
+ $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
+ $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+ $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+ $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+ $(coders_tga_la_SOURCES) $(coders_tiff_la_SOURCES) \
+ $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
+ $(coders_topol_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_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_xwd_la_SOURCES) $(coders_yuv_la_SOURCES) \
+ $(filters_analyze_la_SOURCES) \
$(magick_libGraphicsMagick_la_SOURCES) \
$(wand_libGraphicsMagickWand_la_SOURCES) \
$(Magick___demo_analyze_SOURCES) \
@@ -2042,46 +2057,47 @@
$(coders_ept_la_SOURCES) $(coders_fax_la_SOURCES) \
$(coders_fits_la_SOURCES) $(coders_fpx_la_SOURCES) \
$(coders_gif_la_SOURCES) $(coders_gradient_la_SOURCES) \
- $(coders_gray_la_SOURCES) $(coders_histogram_la_SOURCES) \
- $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \
- $(coders_icon_la_SOURCES) $(coders_identity_la_SOURCES) \
- $(coders_info_la_SOURCES) $(coders_jbig_la_SOURCES) \
- $(coders_jnx_la_SOURCES) $(coders_jp2_la_SOURCES) \
- $(coders_jpeg_la_SOURCES) $(coders_label_la_SOURCES) \
- $(coders_locale_la_SOURCES) $(coders_logo_la_SOURCES) \
- $(coders_mac_la_SOURCES) $(coders_map_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_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
- $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
- $(coders_pdf_la_SOURCES) $(coders_pict_la_SOURCES) \
- $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
- $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
- $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
- $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
- $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
- $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
- $(coders_rle_la_SOURCES) $(coders_sct_la_SOURCES) \
- $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
- $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
- $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
- $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
- $(coders_tim_la_SOURCES) $(coders_topol_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_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_xwd_la_SOURCES) \
- $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
+ $(coders_gray_la_SOURCES) $(coders_heif_la_SOURCES) \
+ $(coders_histogram_la_SOURCES) $(coders_hrz_la_SOURCES) \
+ $(coders_html_la_SOURCES) $(coders_icon_la_SOURCES) \
+ $(coders_identity_la_SOURCES) $(coders_info_la_SOURCES) \
+ $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \
+ $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \
+ $(coders_label_la_SOURCES) $(coders_locale_la_SOURCES) \
+ $(coders_logo_la_SOURCES) $(coders_mac_la_SOURCES) \
+ $(coders_map_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_pcd_la_SOURCES) \
+ $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \
+ $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \
+ $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+ $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+ $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+ $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+ $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+ $(coders_pwp_la_SOURCES) $(coders_rgb_la_SOURCES) \
+ $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
+ $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+ $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+ $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+ $(coders_tga_la_SOURCES) $(coders_tiff_la_SOURCES) \
+ $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
+ $(coders_topol_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_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_xwd_la_SOURCES) $(coders_yuv_la_SOURCES) \
+ $(filters_analyze_la_SOURCES) \
$(am__magick_libGraphicsMagick_la_SOURCES_DIST) \
$(wand_libGraphicsMagickWand_la_SOURCES) \
$(Magick___demo_analyze_SOURCES) \
@@ -2484,6 +2500,7 @@
LIB_DPS = @LIB_DPS@
LIB_FPX = @LIB_FPX@
LIB_GDI32 = @LIB_GDI32@
+LIB_HEIF = @LIB_HEIF@
LIB_JBIG = @LIB_JBIG@
LIB_JP2 = @LIB_JP2@
LIB_JPEG = @LIB_JPEG@
@@ -2685,6 +2702,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -2867,6 +2885,8 @@
@HasX11_TRUE@MAGICK_X11_CODER_SRCS = coders/x.c coders/xwd.c
@HasWEBP_TRUE@MAGICK_WEBP_MODULES = coders/webp.la
@HasWEBP_TRUE@MAGICK_WEBP_SRCS = coders/webp.c
+@HasHEIF_TRUE@MAGICK_HEIF_MODULES = coders/heif.la
+@HasHEIF_TRUE@MAGICK_HEIF_SRCS = coders/heif.c
@ENABLE_BROKEN_CODERS_TRUE@MAGICK_BROKEN_MODULES = coders/psd.la
@ENABLE_BROKEN_CODERS_TRUE@MAGICK_BROKEN_SRCS = coders/psd.c
MAGICK_CODER_CPPFLAGS = \
@@ -2970,7 +2990,8 @@
$(MAGICK_JP2_SRCS) \
$(MAGICK_TIFF_SRCS) \
$(MAGICK_X11_CODER_SRCS) \
- $(MAGICK_WEBP_SRCS)
+ $(MAGICK_WEBP_SRCS) \
+ $(MAGICK_HEIF_SRCS)
@WITH_MODULES_FALSE@coders_LTLIBRARIES =
@WITH_MODULES_TRUE@coders_LTLIBRARIES = \
@@ -3064,7 +3085,7 @@
@WITH_MODULES_TRUE@ $(MAGICK_DPS_MODULES) $(MAGICK_FPX_MODULES) $(MAGICK_GDI32_MODULES) \
@WITH_MODULES_TRUE@ $(MAGICK_JBIG_MODULES) $(MAGICK_JPEG_MODULES) $(MAGICK_JP2_MODULES) \
@WITH_MODULES_TRUE@ $(MAGICK_PNG_MODULES) $(MAGICK_TIFF_MODULES) $(MAGICK_X11_CODER_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_WEBP_MODULES)
+@WITH_MODULES_TRUE@ $(MAGICK_WEBP_MODULES) $(MAGICK_HEIF_MODULES)
# ART coder module
@@ -3672,6 +3693,12 @@
coders_webp_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_webp_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_webp_la_LIBADD = $(LIBMAGICK) $(LIB_WEBP)
+
+# HEIF coder module
+coders_heif_la_SOURCES = coders/heif.c
+coders_heif_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+coders_heif_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_heif_la_LIBADD = $(LIBMAGICK) $(LIB_HEIF)
magickincdir = $(topincludedir)/magick
# Headers which are installed
@@ -5332,6 +5359,11 @@
coders/gray.la: $(coders_gray_la_OBJECTS) $(coders_gray_la_DEPENDENCIES) $(EXTRA_coders_gray_la_DEPENDENCIES) coders/$(am__dirstamp)
$(AM_V_CCLD)$(coders_gray_la_LINK) $(am_coders_gray_la_rpath) $(coders_gray_la_OBJECTS) $(coders_gray_la_LIBADD) $(LIBS)
+coders/heif_la-heif.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+
+coders/heif.la: $(coders_heif_la_OBJECTS) $(coders_heif_la_DEPENDENCIES) $(EXTRA_coders_heif_la_DEPENDENCIES) coders/$(am__dirstamp)
+ $(AM_V_CCLD)$(coders_heif_la_LINK) $(am_coders_heif_la_rpath) $(coders_heif_la_OBJECTS) $(coders_heif_la_LIBADD) $(LIBS)
coders/histogram_la-histogram.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
@@ -6103,6 +6135,8 @@
coders/$(DEPDIR)/$(am__dirstamp)
coders/magick_libGraphicsMagick_la-webp.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
+coders/magick_libGraphicsMagick_la-heif.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
filters/magick_libGraphicsMagick_la-analyze.lo: \
filters/$(am__dirstamp) filters/$(DEPDIR)/$(am__dirstamp)
@@ -6459,6 +6493,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/gif_la-gif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/gradient_la-gradient.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/gray_la-gray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/heif_la-heif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/histogram_la-histogram.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/hrz_la-hrz.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/html_la-html.Plo@am__quote@ # am--include-marker
@@ -6496,6 +6531,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-gif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-gradient.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-gray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-histogram.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-hrz.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-html.Plo@am__quote@ # am--include-marker
@@ -6919,6 +6955,13 @@
@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_gray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/gray_la-gray.lo `test -f 'coders/gray.c' || echo '$(srcdir)/'`coders/gray.c
+coders/heif_la-heif.lo: coders/heif.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_heif_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/heif_la-heif.lo -MD -MP -MF coders/$(DEPDIR)/heif_la-heif.Tpo -c -o coders/heif_la-heif.lo `test -f 'coders/heif.c' || echo '$(srcdir)/'`coders/heif.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/heif_la-heif.Tpo coders/$(DEPDIR)/heif_la-heif.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/heif.c' object='coders/heif_la-heif.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_heif_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/heif_la-heif.lo `test -f 'coders/heif.c' || echo '$(srcdir)/'`coders/heif.c
+
coders/histogram_la-histogram.lo: coders/histogram.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_histogram_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/histogram_la-histogram.lo -MD -MP -MF coders/$(DEPDIR)/histogram_la-histogram.Tpo -c -o coders/histogram_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/histogram_la-histogram.Tpo coders/$(DEPDIR)/histogram_la-histogram.Plo
@@ -8746,6 +8789,13 @@
@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) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libGraphicsMagick_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
+coders/magick_libGraphicsMagick_la-heif.lo: coders/heif.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libGraphicsMagick_la-heif.lo -MD -MP -MF coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Tpo -c -o coders/magick_libGraphicsMagick_la-heif.lo `test -f 'coders/heif.c' || echo '$(srcdir)/'`coders/heif.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Tpo coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/heif.c' object='coders/magick_libGraphicsMagick_la-heif.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) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libGraphicsMagick_la-heif.lo `test -f 'coders/heif.c' || echo '$(srcdir)/'`coders/heif.c
+
filters/magick_libGraphicsMagick_la-analyze.lo: filters/analyze.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filters/magick_libGraphicsMagick_la-analyze.lo -MD -MP -MF filters/$(DEPDIR)/magick_libGraphicsMagick_la-analyze.Tpo -c -o filters/magick_libGraphicsMagick_la-analyze.lo `test -f 'filters/analyze.c' || echo '$(srcdir)/'`filters/analyze.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) filters/$(DEPDIR)/magick_libGraphicsMagick_la-analyze.Tpo filters/$(DEPDIR)/magick_libGraphicsMagick_la-analyze.Plo
@@ -10194,6 +10244,7 @@
-rm -f coders/$(DEPDIR)/gif_la-gif.Plo
-rm -f coders/$(DEPDIR)/gradient_la-gradient.Plo
-rm -f coders/$(DEPDIR)/gray_la-gray.Plo
+ -rm -f coders/$(DEPDIR)/heif_la-heif.Plo
-rm -f coders/$(DEPDIR)/histogram_la-histogram.Plo
-rm -f coders/$(DEPDIR)/hrz_la-hrz.Plo
-rm -f coders/$(DEPDIR)/html_la-html.Plo
@@ -10231,6 +10282,7 @@
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gif.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gradient.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gray.Plo
+ -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-histogram.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-hrz.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-html.Plo
@@ -10582,6 +10634,7 @@
-rm -f coders/$(DEPDIR)/gif_la-gif.Plo
-rm -f coders/$(DEPDIR)/gradient_la-gradient.Plo
-rm -f coders/$(DEPDIR)/gray_la-gray.Plo
+ -rm -f coders/$(DEPDIR)/heif_la-heif.Plo
-rm -f coders/$(DEPDIR)/histogram_la-histogram.Plo
-rm -f coders/$(DEPDIR)/hrz_la-hrz.Plo
-rm -f coders/$(DEPDIR)/html_la-html.Plo
@@ -10619,6 +10672,7 @@
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gif.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gradient.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-gray.Plo
+ -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-heif.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-histogram.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-hrz.Plo
-rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-html.Plo
diff -r 48c9416cca66 -r b87ad3d9b35b README.txt
--- a/README.txt Mon May 10 11:16:24 2021 -0500
+++ b/README.txt Fri Jan 14 18:12:58 2022 -0600
@@ -394,3 +394,9 @@
https://github.com/ebiggers/libdeflate). Linking with this
library may be necessary for builds where libtiff depends on
libdeflate.
+
+* GraphicsMagick requires the heif library from
+
+ https://github.com/strukturag/libheif
+
+ to read heif/heic files.
diff -r 48c9416cca66 -r b87ad3d9b35b coders/Makefile.am
--- a/coders/Makefile.am Mon May 10 11:16:24 2021 -0500
+++ b/coders/Makefile.am Fri Jan 14 18:12:58 2022 -0600
@@ -61,6 +61,11 @@
MAGICK_WEBP_SRCS = coders/webp.c
endif
+if HasHEIF
+MAGICK_HEIF_MODULES = coders/heif.la
+MAGICK_HEIF_SRCS = coders/heif.c
+endif
+
if ENABLE_BROKEN_CODERS
MAGICK_BROKEN_MODULES = coders/psd.la
MAGICK_BROKEN_SRCS = coders/psd.c
@@ -167,7 +172,8 @@
$(MAGICK_JP2_SRCS) \
$(MAGICK_TIFF_SRCS) \
$(MAGICK_X11_CODER_SRCS) \
- $(MAGICK_WEBP_SRCS)
+ $(MAGICK_WEBP_SRCS) \
+ $(MAGICK_HEIF_SRCS)
if WITH_MODULES
coders_LTLIBRARIES = \
@@ -261,7 +267,7 @@
$(MAGICK_DPS_MODULES) $(MAGICK_FPX_MODULES) $(MAGICK_GDI32_MODULES) \
$(MAGICK_JBIG_MODULES) $(MAGICK_JPEG_MODULES) $(MAGICK_JP2_MODULES) \
$(MAGICK_PNG_MODULES) $(MAGICK_TIFF_MODULES) $(MAGICK_X11_CODER_MODULES) \
- $(MAGICK_WEBP_MODULES)
+ $(MAGICK_WEBP_MODULES) $(MAGICK_HEIF_MODULES)
else
coders_LTLIBRARIES =
endif # WITH_MODULES
@@ -871,3 +877,9 @@
coders_webp_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_webp_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_webp_la_LIBADD = $(LIBMAGICK) $(LIB_WEBP)
+
+# HEIF coder module
+coders_heif_la_SOURCES = coders/heif.c
+coders_heif_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+coders_heif_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_heif_la_LIBADD = $(LIBMAGICK) $(LIB_HEIF)
diff -r 48c9416cca66 -r b87ad3d9b35b coders/heif.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coders/heif.c Fri Jan 14 18:12:58 2022 -0600
@@ -0,0 +1,373 @@
+/*
+% Copyright (C) 2021 GraphicsMagick Group
+%
+% This program is covered by multiple licenses, which are described in
+% Copyright.txt. You should have received a copy of Copyright.txt with this
+% package; otherwise see http://www.graphicsmagick.org/www/Copyright.html.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% H H EEEEE I FFFFF %
+% H H E I F %
+% HHHHH EEEEE I FFFF %