From bf9a9c51a1e56e106e3cffd4c6451db7e628b4fd Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Wed, 26 Aug 2026 15:52:22 +0200 Subject: [PATCH 1/4] Squashed 'lib/h5z-htj2k/' changes from ba280c2aa8..bb6bf0cd24 bb6bf0cd24 Change includes to use OpenJPH installation exposed include dir git-subtree-dir: lib/h5z-htj2k git-subtree-split: bb6bf0cd24413b01481b6ce096a612a3eba8bfd4 --- CHANGELOG.md | 5 +++++ CMakeLists.txt | 2 +- pixi.toml | 2 +- src/backend_openjph.cpp | 10 +++++----- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5f40bd5..c150889b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +0.1.1 - 2026/08/26 +================== + +- Fixed OpenJPH includes to match pkg-config information + 0.1.0 - 2026/08/25 ================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 513d99be..c117adcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ else() message(STATUS "Using OpenJPH backend (vendored: ${CMAKE_CURRENT_SOURCE_DIR}/vendored/OpenJPH)") - set(_backend_include_dirs) + set(_backend_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/vendored/OpenJPH/src/core) set(_backend_libs openjph) endif() diff --git a/pixi.toml b/pixi.toml index ebf883e1..d97224e4 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,6 +1,6 @@ [workspace] name = "h5z-htj2k" -version = "0.1.0" +version = "0.1.1" channels = ["conda-forge"] platforms = ["win-64", "linux-64", "osx-arm64"] diff --git a/src/backend_openjph.cpp b/src/backend_openjph.cpp index 3b07b472..0b80af5b 100644 --- a/src/backend_openjph.cpp +++ b/src/backend_openjph.cpp @@ -7,11 +7,11 @@ #include #include -#include "ojph_arch.h" -#include "ojph_codestream.h" -#include "ojph_file.h" -#include "ojph_mem.h" -#include "ojph_params.h" +#include "openjph/ojph_arch.h" +#include "openjph/ojph_codestream.h" +#include "openjph/ojph_file.h" +#include "openjph/ojph_mem.h" +#include "openjph/ojph_params.h" namespace { From 71c6f5d37e2be5abd59c99681b4045a3812fed3b Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Wed, 26 Aug 2026 15:53:01 +0200 Subject: [PATCH 2/4] update vendored version of h5z-htj2k --- doc/information.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/information.rst b/doc/information.rst index ae066dff..8d66a70e 100644 --- a/doc/information.rst +++ b/doc/information.rst @@ -74,7 +74,7 @@ HDF5 compression filters and compression libraries sources were obtained from: * `FCIDECOMP plugin `_ (`v2.1.1 `_) using `CharLS `_ (v2.1.0). -* `h5z-htj2k plugin `_ (v0.1.0) using +* `h5z-htj2k plugin `_ (v0.1.1) using `OpenJPH `_ (v0.31.0). * `SZ plugin `_ (commit `308bd06 `_) From dbed5643090a3e2e322a7c30ecb2d86e6a1ba14c Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Wed, 26 Aug 2026 15:54:57 +0200 Subject: [PATCH 3/4] update changelog --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0039b912..46bb07d1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,7 @@ This release adds the new plugin `h5z-htj2k`. - Compression filters and libraries: - * Added **Htj2k** filter (PR #405) + * Added **Htj2k** filter (v0.1.1) and **OpenJPH** (v0.31.0) (PR #405, #409) * Updated **blosc2** hdf5 filter (v3.0.1) and **c-blosc2** compression library (v3.3.2) (PR #407) 7.0.0: 25/06/2026 From 9c015783a71147365a6dc16ab1e7b37564d57d0e Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Wed, 26 Aug 2026 15:57:26 +0200 Subject: [PATCH 4/4] update openjph include path and fix h5z-htj2k extension options --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 94563320..88865b9f 100644 --- a/setup.py +++ b/setup.py @@ -1018,7 +1018,7 @@ def portable_sources(pattern): config = dict( sources=sources, - include_dirs=[f"{openjph_dir}/openjph"], + include_dirs=[openjph_dir, f"{openjph_dir}/openjph"], macros=[("OJPH_DISABLE_SIMD", None), ("_FILE_OFFSET_BITS", 64)], cflags=["-O3", "/O2"], ) @@ -1453,8 +1453,8 @@ def _get_htj2k_plugin(): "hdf5plugin.plugins.libh5htj2k", sources=[f"{h5z_htj2k_dir}/H5Zhtj2k.c", f"{h5z_htj2k_dir}/backend_openjph.cpp"], include_dirs=[h5z_htj2k_dir] + get_clib_config("openjph", "include_dirs"), - libraries=get_clib_config("openjph", "extra_link_args"), extra_compile_args=extra_compile_args, + extra_link_args=get_clib_config("openjph", "extra_link_args"), cpp14_required=True, )