sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow libjxl 0.5 (#2539)

Browse Source
This commit is contained in:
Remi Collet 2021-11-16 10:51:19 +01:00 committed by GitHub
parent 57a0bd82f9
commit 407bd1391d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -837,9 +837,9 @@ AS_IF([test x"$with_libjxl" = x"module"],
[with_libjxl_module=no])
if test x"$with_libjxl" != x"no"; then
PKG_CHECK_MODULES(LIBJXL, libjxl_threads >= 0.6 libjxl >= 0.6,
PKG_CHECK_MODULES(LIBJXL, libjxl_threads >= 0.5 libjxl >= 0.5,
[AC_DEFINE(HAVE_LIBJXL,1,
[define if you have libjxl >= 0.6 installed.])
[define if you have libjxl >= 0.5 installed.])
with_libjxl=yes
AS_IF([test x"$with_libjxl_module" = x"no"],
[PACKAGES_USED="$PACKAGES_USED libjxl"])
@ -851,6 +851,19 @@ if test x"$with_libjxl" != x"no"; then
)
fi
if test x"$with_libjxl" = x"yes"; then
save_LIBS="$LIBS"
LIBS="$LIBS $LIBJXL_LIBS"
# Introduced in 0.6
AC_CHECK_FUNCS(JxlEncoderInitBasicInfo,[
AC_DEFINE(HAVE_LIBJXL_JXLENCODERINITBASICINFO,1,
[define if you have heif_image_handle_get_raw_color_profile.])
],[]
)
LIBS="$save_LIBS"
fi
AS_IF([test x"$with_libjxl_module" = x"yes"],
[AC_DEFINE([LIBJXL_MODULE], [1], [define to build libjxl as a dynamically loadable module.])],
[VIPS_CFLAGS="$VIPS_CFLAGS $LIBJXL_CFLAGS"

2
libvips/foreign/jxlsave.c
View File

@ -261,7 +261,9 @@ vips_foreign_save_jxl_build( VipsObject *object )
return( -1 );
}
#ifdef HAVE_LIBJXL_JXLENCODERINITBASICINFO
JxlEncoderInitBasicInfo( &jxl->info );
#endif
switch( save->ready->BandFmt ) {
case VIPS_FORMAT_UCHAR: