Skip to content

Fixed build with OpenJPH system library and updated h5z-htj2k v0.1.1 #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t20100 merged 5 commits into from
Aug 26, 2026
Merged

Fixed build with OpenJPH system library and updated h5z-htj2k v0.1.1 #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf9a9c5
Squashed 'lib/h5z-htj2k/' changes from ba280c2aa8..bb6bf0cd24
t20100 Aug 26, 2026
bbd7d76
Merge commit 'bf9a9c51a1e56e106e3cffd4c6451db7e628b4fd'
t20100 Aug 26, 2026
71c6f5d
update vendored version of h5z-htj2k
t20100 Aug 26, 2026
dbed564
update changelog
t20100 Aug 26, 2026
9c01578
update openjph include path and fix h5z-htj2k extension options
t20100 Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/information.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ HDF5 compression filters and compression libraries sources were obtained from:
* `FCIDECOMP plugin <https://gitlab.eumetsat.int/open-source/data-tailor-plugins/fcidecomp>`_
(`v2.1.1 <https://gitlab.eumetsat.int/open-source/data-tailor-plugins/fcidecomp/-/tree/2.1.1>`_)
using `CharLS <https://github.com/team-charls/charls>`_ (v2.1.0).
* `h5z-htj2k plugin <https://github.com/silx-kit/h5z-htj2k>`_ (v0.1.0) using
* `h5z-htj2k plugin <https://github.com/silx-kit/h5z-htj2k>`_ (v0.1.1) using
`OpenJPH <https://github.com/aous72/OpenJPH>`_ (v0.31.0).
* `SZ plugin <https://github.com/szcompressor/SZ2>`_
(commit `308bd06 <https://github.com/szcompressor/SZ2/tree/308bd06f0040ec0d5c22fb3fcb0428c306ba4df1>`_)
Expand Down
5 changes: 5 additions & 0 deletions lib/h5z-htj2k/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.1.1 - 2026/08/26
==================

- Fixed OpenJPH includes to match pkg-config information

0.1.0 - 2026/08/25
==================

Expand Down
2 changes: 1 addition & 1 deletion lib/h5z-htj2k/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion lib/h5z-htj2k/pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
10 changes: 5 additions & 5 deletions lib/h5z-htj2k/src/backend_openjph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <cstring>
#include <exception>

#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 {

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Expand Down Expand Up @@ -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"),

@t20100 t20100 Aug 26, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes an issue only showing up when building with system lib.

cpp14_required=True,
)

Expand Down
Loading