diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data index 7df19d54..d0247b83 100644 --- a/abi-check/db/openjpeg/Tracker.data +++ b/abi-check/db/openjpeg/Tracker.data @@ -524,7 +524,7 @@ $VAR1 = { 'lib/libopenjp2.so.2.1.1' => 'libopenjp2.so.7' }, 'current' => { - 'lib/libopenjp2.so.2.1.1' => 'libopenjp2.so.7' + 'lib/libopenjp2.so.2.1.2' => 'libopenjp2.so.7' } }, 'Sover' => { diff --git a/abi-check/installed/openjpeg/2.1.1/lib/libopenjp2.so.2.1.1 b/abi-check/installed/openjpeg/2.1.1/lib/libopenjp2.so.2.1.1 index b2c68d1e..b989e47e 100644 Binary files a/abi-check/installed/openjpeg/2.1.1/lib/libopenjp2.so.2.1.1 and b/abi-check/installed/openjpeg/2.1.1/lib/libopenjp2.so.2.1.1 differ diff --git a/abi-check/installed/openjpeg/current/include/openjpeg-2.1/openjpeg.h b/abi-check/installed/openjpeg/current/include/openjpeg-2.1/openjpeg.h index 7912c236..c07e9c84 100644 --- a/abi-check/installed/openjpeg/current/include/openjpeg-2.1/openjpeg.h +++ b/abi-check/installed/openjpeg/current/include/openjpeg-2.1/openjpeg.h @@ -1262,25 +1262,6 @@ OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t * OPJ_API OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, opj_dparameters_t *parameters ); -/** - * Allocates worker threads for the compressor/decompressor. - * - * By default, only the main thread is used. If this function is not used, - * but the OPJ_NUM_THREADS environment variable is set, its value will be - * used to initialize the number of threads. The value can be either an integer - * number, or "ALL_CPUS". If OPJ_NUM_THREADS is set and this function is called, - * this function will override the behaviour of the environment variable. - * - * Note: currently only has effect on the decompressor. - * - * @param p_codec decompressor handler - * @param num_threads number of threads. - * - * @return OPJ_TRUE if the decoder is correctly set - */ -OPJ_API OPJ_BOOL OPJ_CALLCONV opj_codec_set_threads(opj_codec_t *p_codec, - int num_threads); - /** * Decodes an image header. * @@ -1573,19 +1554,6 @@ OPJ_API OPJ_BOOL OPJ_CALLCONV opj_set_MCT( opj_cparameters_t *parameters, OPJ_INT32 * p_dc_shift, OPJ_UINT32 pNbComp); -/* -========================================================== - Thread functions -========================================================== -*/ - -/** Returns if the library is built with thread support. - * OPJ_TRUE if mutex, condition, thread, thread pool are available. - */ -OPJ_API OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void); - -/** Return the number of virtual CPUs */ -OPJ_API int OPJ_CALLCONV opj_get_num_cpus(void); #ifdef __cplusplus diff --git a/abi-check/installed/openjpeg/current/include/openjpeg-2.1/opj_config.h b/abi-check/installed/openjpeg/current/include/openjpeg-2.1/opj_config.h index 87caa0d8..03bdff9c 100644 --- a/abi-check/installed/openjpeg/current/include/openjpeg-2.1/opj_config.h +++ b/abi-check/installed/openjpeg/current/include/openjpeg-2.1/opj_config.h @@ -7,4 +7,4 @@ /* Version number. */ #define OPJ_VERSION_MAJOR 2 #define OPJ_VERSION_MINOR 1 -#define OPJ_VERSION_BUILD 1 +#define OPJ_VERSION_BUILD 2 diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.1.2 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.1.2 new file mode 100644 index 00000000..9a001b36 Binary files /dev/null and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.1.2 differ diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.7 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.7 index 045d78aa..221bf5de 120000 --- a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.7 +++ b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.7 @@ -1 +1 @@ -libopenjp2.so.2.1.1 \ No newline at end of file +libopenjp2.so.2.1.2 \ No newline at end of file diff --git a/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGConfig.cmake b/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGConfig.cmake index 96923e24..248f14e7 100644 --- a/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGConfig.cmake +++ b/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGConfig.cmake @@ -8,7 +8,7 @@ # The OPENJPEG version number. set(OPENJPEG_MAJOR_VERSION "2") set(OPENJPEG_MINOR_VERSION "1") -set(OPENJPEG_BUILD_VERSION "1") +set(OPENJPEG_BUILD_VERSION "2") # The libraries. set(OPENJPEG_LIBRARIES "openjp2") diff --git a/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake b/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake index d5baa006..00a82c5f 100644 --- a/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake +++ b/abi-check/installed/openjpeg/current/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake @@ -13,13 +13,13 @@ GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # Import target "openjp2" for configuration "Debug" SET_PROPERTY(TARGET openjp2 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) SET_TARGET_PROPERTIES(openjp2 PROPERTIES - IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG "m;-lpthread" - IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libopenjp2.so.2.1.1" + IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG "m" + IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libopenjp2.so.2.1.2" IMPORTED_SONAME_DEBUG "libopenjp2.so.7" ) LIST(APPEND _IMPORT_CHECK_TARGETS openjp2 ) -LIST(APPEND _IMPORT_CHECK_FILES_FOR_openjp2 "${_IMPORT_PREFIX}/lib/libopenjp2.so.2.1.1" ) +LIST(APPEND _IMPORT_CHECK_FILES_FOR_openjp2 "${_IMPORT_PREFIX}/lib/libopenjp2.so.2.1.2" ) # Import target "opj_decompress" for configuration "Debug" SET_PROPERTY(TARGET opj_decompress APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) diff --git a/abi-check/installed/openjpeg/current/lib/pkgconfig/libopenjp2.pc b/abi-check/installed/openjpeg/current/lib/pkgconfig/libopenjp2.pc index 2f7247c7..9b97ee4f 100644 --- a/abi-check/installed/openjpeg/current/lib/pkgconfig/libopenjp2.pc +++ b/abi-check/installed/openjpeg/current/lib/pkgconfig/libopenjp2.pc @@ -8,7 +8,7 @@ includedir=${prefix}/include/openjpeg-2.1 Name: openjp2 Description: JPEG2000 library (Part 1 and 2) URL: http://www.openjpeg.org/ -Version: 2.1.1 +Version: 2.1.2 Libs: -L${libdir} -lopenjp2 Libs.private: -lm Cflags: -I${includedir} diff --git a/abi-check/openjpeg.json b/abi-check/openjpeg.json index 71800a4c..27d7c7fc 100644 --- a/abi-check/openjpeg.json +++ b/abi-check/openjpeg.json @@ -113,7 +113,9 @@ "HeadersDiff": "On", "PkgDiff": "Off", "ABIView": "Off", - "ABIDiff": "Off" + "ABIDiff": "Off", + "PublicSymbols": "public_symbols/openjpeg/1.4/list", + "PublicTypes": "public_types/openjpeg/1.4/list" }, { "Number": "1.2", @@ -123,7 +125,9 @@ "HeadersDiff": "On", "PkgDiff": "Off", "ABIView": "Off", - "ABIDiff": "Off" + "ABIDiff": "Off", + "PublicSymbols": "public_symbols/openjpeg/1.2/list", + "PublicTypes": "public_types/openjpeg/1.2/list" }, { "Number": "1.1", diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html index 373dca32..84773689 100644 --- a/abi-check/timeline/openjpeg/index.html +++ b/abi-check/timeline/openjpeg/index.html @@ -143,7 +143,7 @@