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

Allow libjxl 0.6 (#3223)

Browse Source 
This partially reverts commit 0029b3c4.
This commit is contained in:
Kleis Auke Wolthuizen 2022-12-08 14:22:36 +01:00 committed by GitHub
parent ac4c2d2b3d
commit 20a4d6029d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,7 +8,7 @@ master
- jp2ksave defaults to chroma subsample off, and jp2 write - jp2ksave defaults to chroma subsample off, and jp2 write
- don't minimise sink_screen input after expose ... improves caching during - don't minimise sink_screen input after expose ... improves caching during
interactive use interactive use
- require libjxl 0.7+ - require libjxl 0.6+
- add "interlace" option to GIF save [dloebl] - add "interlace" option to GIF save [dloebl]
- magick load sets "magick-format" metadata [aksdb] - magick load sets "magick-format" metadata [aksdb]
- add ".pnm" save [ewelot] - add ".pnm" save [ewelot]

12
libvips/foreign/jxlsave.c
View File

@ -229,7 +229,11 @@ vips_foreign_save_jxl_build( VipsObject *object )
VipsForeignSaveJxl *jxl = (VipsForeignSaveJxl *) object; VipsForeignSaveJxl *jxl = (VipsForeignSaveJxl *) object;
VipsImage **t = (VipsImage **) vips_object_local_array( object, 5 ); VipsImage **t = (VipsImage **) vips_object_local_array( object, 5 );
#ifdef HAVE_LIBJXL_0_7
JxlEncoderFrameSettings *frame_settings; JxlEncoderFrameSettings *frame_settings;
#else
JxlEncoderOptions *frame_settings;
#endif
JxlEncoderStatus status; JxlEncoderStatus status;
VipsImage *in; VipsImage *in;
VipsBandFormat format; VipsBandFormat format;
@ -413,6 +417,7 @@ vips_foreign_save_jxl_build( VipsObject *object )
if( vips_image_wio_input( in ) ) if( vips_image_wio_input( in ) )
return( -1 ); return( -1 );
#ifdef HAVE_LIBJXL_0_7
frame_settings = JxlEncoderFrameSettingsCreate( jxl->encoder, NULL ); frame_settings = JxlEncoderFrameSettingsCreate( jxl->encoder, NULL );
JxlEncoderFrameSettingsSetOption( frame_settings, JxlEncoderFrameSettingsSetOption( frame_settings,
JXL_ENC_FRAME_SETTING_DECODING_SPEED, jxl->tier ); JXL_ENC_FRAME_SETTING_DECODING_SPEED, jxl->tier );
@ -420,6 +425,13 @@ vips_foreign_save_jxl_build( VipsObject *object )
JxlEncoderFrameSettingsSetOption( frame_settings, JxlEncoderFrameSettingsSetOption( frame_settings,
JXL_ENC_FRAME_SETTING_EFFORT, jxl->effort ); JXL_ENC_FRAME_SETTING_EFFORT, jxl->effort );
JxlEncoderSetFrameLossless( frame_settings, jxl->lossless ); JxlEncoderSetFrameLossless( frame_settings, jxl->lossless );
#else
frame_settings = JxlEncoderOptionsCreate( jxl->encoder, NULL );
JxlEncoderOptionsSetDecodingSpeed( frame_settings, jxl->tier );
JxlEncoderOptionsSetDistance( frame_settings, jxl->distance );
JxlEncoderOptionsSetEffort( frame_settings, jxl->effort );
JxlEncoderOptionsSetLossless( frame_settings, jxl->lossless );
#endif
#ifdef DEBUG #ifdef DEBUG
vips_foreign_save_jxl_print_info( &jxl->info ); vips_foreign_save_jxl_print_info( &jxl->info );

7
meson.build
View File

@ -471,8 +471,8 @@ if libheif_dep.found()
endif endif
endif endif
libjxl_dep = dependency('libjxl', version: '>=0.7', required: get_option('jpeg-xl')) libjxl_dep = dependency('libjxl', version: '>=0.6', required: get_option('jpeg-xl'))
libjxl_threads_dep = dependency('libjxl_threads', version: '>=0.7', required: get_option('jpeg-xl')) libjxl_threads_dep = dependency('libjxl_threads', version: '>=0.6', required: get_option('jpeg-xl'))
libjxl_found = libjxl_dep.found() and libjxl_threads_dep.found() libjxl_found = libjxl_dep.found() and libjxl_threads_dep.found()
libjxl_module = false libjxl_module = false
if libjxl_found if libjxl_found
@ -484,6 +484,9 @@ if libjxl_found
libvips_deps += libjxl_threads_dep libvips_deps += libjxl_threads_dep
endif endif
cfg_var.set('HAVE_LIBJXL', '1') cfg_var.set('HAVE_LIBJXL', '1')
if libjxl_dep.version().version_compare('>=0.7')
cfg_var.set('HAVE_LIBJXL_0_7', '1')
endif
endif endif
libpoppler_dep = dependency('poppler-glib', version: '>=0.16.0', required: get_option('poppler')) libpoppler_dep = dependency('poppler-glib', version: '>=0.16.0', required: get_option('poppler'))