Merge pull request #5007 from blowekamp/openjpeg_update_2.5.2

OpenJPEG update 2.5.2 - Add JPH read support.
InsightSoftwareConsortium · Dec 6, 2024 · 48bc2dc · 48bc2dc
2 parents d6ce189 + 823a55f
commit 48bc2dc
Show file tree

Hide file tree

Showing 118 changed files with 50,137 additions and 28,807 deletions.
diff --git a/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx b/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx
diff --git a/Modules/ThirdParty/OpenJPEG/.gitattributes b/Modules/ThirdParty/OpenJPEG/.gitattributes
@@ -0,0 +1 @@
+src/openjpeg/src/lib/openjp2/j2k.c        hooks-max-size=500000
diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
@@ -2,8 +2,9 @@ project(ITKOpenJPEG)
 set(ITKOpenJPEG_THIRD_PARTY 1)
 
 set(ITKOpenJPEG_INCLUDE_DIRS
-  ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg
-  ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg
+  ${ITKOpenJPEG_SOURCE_DIR}/src/
+  ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg/src/lib/openjp2
+  ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg/src/lib/openjp2
   )
 set(ITKOpenJPEG_LIBRARIES itkopenjpeg)
 set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)

diff --git a/Modules/ThirdParty/OpenJPEG/UpdateFromUpstream.sh b/Modules/ThirdParty/OpenJPEG/UpdateFromUpstream.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+shopt -s dotglob
+
+readonly name="openjpeg"
+readonly ownership="OpenJPEG Upstream <[email protected]>"
+readonly subtree="Modules/ThirdParty/OpenJPEG/src/$name"
+readonly repo="https://github.com/uclouvain/openjpeg.git"
+readonly tag="v2.5.2"
+readonly paths="
+CMakeLists.txt
+README.md
+LICENSE
+
+cmake/EnsureFileInclude.cmake
+cmake/TestLargeFiles.cmake
+
+src/lib/CMakeLists.txt
+src/lib/openjp2/CMakeLists.txt
+src/lib/openjp2/*.c
+src/lib/openjp2/*.h
+src/lib/openjp2/*.cmake.in
+"
+
+extract_source () {
+    git_archive
+    pushd "${extractdir}/${name}-reduced"
+    echo "* -whitespace" >> .gitattributes
+    echo "" >> src/lib/openjp2/mqc.c
+    echo "" >> src/lib/openjp2/t1_ht_luts.h
+    popd
+}
+
+. "${BASH_SOURCE%/*}/../../../Utilities/Maintenance/update-third-party.bash"
diff --git a/Modules/ThirdParty/OpenJPEG/src/itk_openjpeg.h b/Modules/ThirdParty/OpenJPEG/src/itk_openjpeg.h
@@ -25,6 +25,8 @@
 #ifndef itk_openjpeg_h
 #define itk_openjpeg_h
 
-#include <itkopenjpeg/openjpeg.h>
+#include <openjpeg/src/lib/openjp2/openjpeg.h>
+#include <openjpeg/src/lib/openjp2/opj_includes.h>
+
 
 #endif
diff --git a/Modules/ThirdParty/OpenJPEG/src/openjpeg/.gitattributes b/Modules/ThirdParty/OpenJPEG/src/openjpeg/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src/openjpeg/src/lib/openjp2/j2k.c hooks-max-size=500000