diff --git a/.gitmodules b/.gitmodules index 03b3076b..abbb89b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ path = detector_control/slsDetectorPackage url = https://github.com/slsdetectorgroup/slsDetectorPackage branch = "developer" +[submodule "compression/bitshuffle_hperf"] + path = compression/bitshuffle_hperf + url = https://github.com/kalcutter/bitshuffle diff --git a/compression/CMakeLists.txt b/compression/CMakeLists.txt index 42f0415c..fd1ca7c1 100644 --- a/compression/CMakeLists.txt +++ b/compression/CMakeLists.txt @@ -4,8 +4,8 @@ ADD_LIBRARY(Compression STATIC bitshuffle/bitshuffle.c bitshuffle/bitshuffle_core.c bitshuffle/iochain.c - bitshuffle_dectris/src/bitshuffle.c - bitshuffle_dectris/src/bitshuffle.h + bitshuffle_hperf/src/bitshuffle.c + bitshuffle_hperf/src/bitshuffle.h JFJochZstdCompressor.cpp JFJochZstdCompressor.h JFJochCompressor.cpp diff --git a/compression/JFJochCompressor.cpp b/compression/JFJochCompressor.cpp index 543fb9cc..fcc7d8bb 100644 --- a/compression/JFJochCompressor.cpp +++ b/compression/JFJochCompressor.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/compression/bitshuffle_hperf b/compression/bitshuffle_hperf new file mode 160000 index 00000000..be844a76 --- /dev/null +++ b/compression/bitshuffle_hperf @@ -0,0 +1 @@ +Subproject commit be844a76f4d4ed3927fcb240a36c6d52bb3908a3