added HEIF writer and replaced HEIF reader with a more complete HEIF implementation (#1099)
* first implementation of HEIC writer based on libheif
* new HEIC reader based on libheif
* rename HEIC image type
* adapt to changed encoder API
* read Exif data from HEIC
* remove check for libde265 from autoconf as we are now depending only on libheif instead
* check in autoconf files (note: these should not be in git)
* support 'ping' for reading image attributes without decoding
* variable HEIF compression quality setting
* show proper error messages
* use image_info->quality instead of image->quality
* restore all files generated by autotools to their original state from master branch
diff --git a/configure.ac b/configure.ac
index abfe1e1..6d1d5aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2263,23 +2263,23 @@
fi
have_heic='no'
-HEIC_CFLAGS=""
-HEIC_LIBS=""
-HEIC_PKG=""
+HEIF_CFLAGS=""
+HEIF_LIBS=""
+HEIF_PKG=""
if test "x$with_heic" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(HEIC,[libde265], have_heic=yes, have_heic=no)
+ PKG_CHECK_MODULES(HEIF,[libheif], have_heic=yes, have_heic=no)
AC_MSG_RESULT([])
fi
if test "$have_heic" = 'yes'; then
- AC_DEFINE(HEIC_DELEGATE,1,Define if you have HEIC library)
- CFLAGS="$HEIC_CFLAGS $CFLAGS"
+ AC_DEFINE(HEIC_DELEGATE,1,Define if you have libheif library)
+ CFLAGS="$HEIF_CFLAGS $CFLAGS"
fi
AM_CONDITIONAL(HEIC_DELEGATE, test "$have_heic" = 'yes')
-AC_SUBST(HEIC_CFLAGS)
-AC_SUBST(HEIC_LIBS)
+AC_SUBST(HEIF_CFLAGS)
+AC_SUBST(HEIF_LIBS)
dnl ===========================================================================
@@ -3884,7 +3884,7 @@
if test "$build_modules" != 'no'; then
MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_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 $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIC_LIBS $WEBPMUX_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 $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $LTDL_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 $HEIF_LIBS $WEBPMUX_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 $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
@@ -4033,7 +4033,7 @@
FreeType --with-freetype=$with_freetype $have_freetype
Ghostscript lib --with-gslib=$with_gslib $have_gslib
Graphviz --with-gvc=$with_gvc $have_gvc
- HEIC --with-heic=$with_heic $have_heic
+ HEIC --with-heic=$with_heic $have_heic
JBIG --with-jbig=$with_jbig $have_jbig
JPEG v1 --with-jpeg=$with_jpeg $have_jpeg
LCMS --with-lcms=$with_lcms $have_lcms