diff --git a/ChangeLog b/ChangeLog index bcd848da..b5c04f7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +xx/1/23 8.14.1 + +- add vips_thread_isworker() compatibility function [remicollet] + 22/12/22 8.14.0 - remove autotools diff --git a/libvips/include/vips/almostdeprecated.h b/libvips/include/vips/almostdeprecated.h index 1f3df78b..0d43ab9e 100644 --- a/libvips/include/vips/almostdeprecated.h +++ b/libvips/include/vips/almostdeprecated.h @@ -398,6 +398,9 @@ void vips_vinfo( const char *domain, const char *fmt, va_list ap ); VIPS_DEPRECATED_FOR(vips_autorot) VipsAngle vips_autorot_get_angle( VipsImage *image ); +VIPS_DEPRECATED_FOR(vips_thread_isvips) +gboolean vips_thread_isworker( void ); + /* iofuncs */ VIPS_DEPRECATED_FOR(g_free) diff --git a/libvips/iofuncs/thread.c b/libvips/iofuncs/thread.c index ae75f6b2..ff2de251 100644 --- a/libvips/iofuncs/thread.c +++ b/libvips/iofuncs/thread.c @@ -87,6 +87,14 @@ vips_thread_isvips( void ) return( g_private_get( is_vips_thread_key ) != NULL ); } +/* Deprecated compatibility function. + */ +gboolean +vips_thread_isworker( void ) +{ + return( vips_thread_isvips() ); +} + /* Glib 2.32 revised the thread API. We need some compat functions. */ diff --git a/meson.build b/meson.build index 15c0a4a5..e5c127b4 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('vips', 'c', 'cpp', - version: '8.14.0', + version: '8.14.1', meson_version: '>=0.56', default_options: [ # this is what glib uses (one of our required deps), so we use it too @@ -19,7 +19,7 @@ version_patch = version_parts[2] # binary interface changed: increment current, reset revision to 0 # binary interface changes backwards compatible?: increment age # binary interface changes not backwards compatible?: reset age to 0 -library_revision = 0 +library_revision = 1 library_current = 58 library_age = 16 library_version = '@0@.@1@.@2@'.format(library_current - library_age, library_age, library_revision) @@ -32,8 +32,7 @@ i18n = import('i18n') add_project_arguments('-Drestrict=__restrict', language: 'cpp') -# if we're optimising (eg. release mode) we turn off cast checks and -# g_asserts +# if we're optimising (eg. release mode) we turn off cast checks and g_asserts if get_option('optimization') in ['2', '3', 's'] add_project_arguments('-DG_DISABLE_CAST_CHECKS', language : ['cpp', 'c']) add_project_arguments('-DG_DISABLE_CHECKS', language : ['cpp', 'c'])