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

Merge branch '8.11'

Browse Source
This commit is contained in:
John Cupitt 2021-07-03 11:47:26 +01:00
commit 6dd6fafa2a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,11 +1,11 @@
<<<<<<< HEAD
14/6/21 started 8.12 14/6/21 started 8.12
- all tools support `--version` - all tools support `--version`
- add vips_svgload_string() convenience function - add vips_svgload_string() convenience function
=======
14/8/20 started 8.11.2 14/8/20 started 8.11.2
- better libdir guessing [remi] - better libdir guessing [remi]
>>>>>>> 8.11 - fix tiff pyramid creation with jp2k compression (was broken by 8.11.1)
- don't load modules if we're built without modules
14/8/20 started 8.11.1 14/8/20 started 8.11.1
- add more example code to C docs - add more example code to C docs

1
configure.ac
View File

@ -459,6 +459,7 @@ else
if test x"$gmodule_supported" = x"true"; then if test x"$gmodule_supported" = x"true"; then
gmodule_supported_flag=yes gmodule_supported_flag=yes
gmodule_with_flag='module' gmodule_with_flag='module'
AC_DEFINE(ENABLE_MODULES,1,[define to enable loadable module support.])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

6
libvips/iofuncs/init.c
View File

@ -536,11 +536,17 @@ vips_init( const char *argv0 )
vips_mosaicing_operation_init(); vips_mosaicing_operation_init();
vips_g_input_stream_get_type(); vips_g_input_stream_get_type();
#ifdef ENABLE_MODULES
/* Load any vips8 modules from the vips libdir. Keep going, even if /* Load any vips8 modules from the vips libdir. Keep going, even if
* some modules fail to load. * some modules fail to load.
*
* Only do this if we have been built as a set of loadable
* modules, or we might try loading an operation into a library that
* already has that operation built in.
*/ */
(void) vips_load_plugins( "%s/vips-modules-%d.%d", (void) vips_load_plugins( "%s/vips-modules-%d.%d",
libdir, VIPS_MAJOR_VERSION, VIPS_MINOR_VERSION ); libdir, VIPS_MAJOR_VERSION, VIPS_MINOR_VERSION );
#endif /*ENABLE_MODULES*/
#if ENABLE_DEPRECATED #if ENABLE_DEPRECATED
/* Load any vips8 plugins from the vips libdir. /* Load any vips8 plugins from the vips libdir.