Skip to content

Commit d0f13a3

Browse files
committed
Merge branch 'master' into feature/issue_3654
# Conflicts: # Modules/IO/ImageBase/include/itkImageSeriesWriter.h
2 parents e056835 + 25d3162 commit d0f13a3

File tree

115 files changed

+417
-2414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+417
-2414
lines changed

.github/workflows/scorecard.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# This workflow uses actions that are not certified by GitHub. They are provided
2-
# by a third-party and are governed by separate terms of service, privacy
3-
# policy, and support documentation.
4-
5-
name: Scorecard supply-chain security
1+
name: Scorecard analysis workflow
62
on:
73
# For Branch-Protection check. Only the default branch is supported. See
84
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
@@ -32,12 +28,12 @@ jobs:
3228

3329
steps:
3430
- name: "Checkout code"
35-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3632
with:
3733
persist-credentials: false
3834

3935
- name: "Run analysis"
40-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
36+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
4137
with:
4238
results_file: results.sarif
4339
results_format: sarif
@@ -56,10 +52,11 @@ jobs:
5652
# of the value entered here.
5753
publish_results: true
5854

59-
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
60-
# format to the repository Actions tab.
55+
# Upload the results as artifacts (optional). Commenting out will disable
56+
# uploads of run results in SARIF format to the repository Actions tab.
57+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
6158
- name: "Upload artifact"
62-
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
59+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
6360
with:
6461
name: SARIF file
6562
path: results.sarif
@@ -68,6 +65,6 @@ jobs:
6865
# Upload the results to GitHub's code scanning dashboard (optional).
6966
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7067
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@v3
68+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
7269
with:
7370
sarif_file: results.sarif

CMake/ITKModuleTest.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@ function(itk_python_add_test)
153153
else()
154154
set(itk_wrap_python_binary_dir "${ITK_BINARY_DIR}/Wrapping/Generators/Python")
155155
endif()
156-
# itk_wrap_python_binary_dir *MUST* contain the WrapITK.pth file
157-
# Final installed version of ITK will leverage the WrapITK.pth paths, so
158-
# the test environment should also use those same paths.
159-
set(WrapITK_PTH_FILE "${itk_wrap_python_binary_dir}/WrapITK.pth")
160-
if(NOT EXISTS ${WrapITK_PTH_FILE})
161-
message(FATAL_ERROR "${WrapITK_PTH_FILE} must exist.")
162-
endif()
163-
unset(WrapITK_PTH_FILE)
164156

165157
itk_add_test(
166158
NAME

Documentation/Doxygen/doxygen.bib

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,58 +1549,7 @@ @article{zijdenbos1994
15491549
doi = {10.1109/42.363096},
15501550
url = {https://doi.org/10.1109/42.363096}
15511551
}
1552-
@book{book_2003,
1553-
title={Computer Aided Systems Theory - EUROCAST 2003: 9th International Workshop on Computer Aided Systems Theory Las Palmas de Gran Canaria, Spain, February 24-28, 2003 Revised Selected Papers},
1554-
ISBN={9783540452102},
1555-
ISSN={1611-3349},
1556-
url={https//dx.doi.org/10.1007/b13239},
1557-
DOI={10.1007/b13239},
1558-
journal={Lecture Notes in Computer Science},
1559-
publisher={Springer Berlin Heidelberg},
1560-
year={2003} }
1561-
@inproceedings{Aylward_2016,
1562-
title={Ultrasound spectroscopy},
1563-
url={https//dx.doi.org/10.1109/ISBI.2016.7493437},
1564-
DOI={10.1109/isbi.2016.7493437},
1565-
booktitle={2016 IEEE 13th International Symposium on Biomedical Imaging (ISBI)},
1566-
publisher={IEEE},
1567-
author={Aylward, S. R. and McCormick, M. and Kang, H. J. and Razzaque, S. and Kwitt, R. and Niethammer, M.},
1568-
year={2016},
1569-
month=apr, pages={1013–1016} }
1570-
@article{Albu_2008,
1571-
title={A Morphology-Based Approach for Interslice Interpolation of Anatomical Slices From Volumetric Images},
1572-
volume={55},
1573-
ISSN={1558-2531},
1574-
url={https//dx.doi.org/10.1109/TBME.2008.921158},
1575-
DOI={10.1109/tbme.2008.921158},
1576-
number={8},
1577-
journal={IEEE Transactions on Biomedical Engineering},
1578-
publisher={Institute of Electrical and Electronics Engineers (IEEE)},
1579-
author={Albu, Alexandra Branzan and Beugeling, Trevor and Laurendeau, Denis},
1580-
year={2008},
1581-
month=aug, pages={2022–2038} }
1582-
@article{McCormick_2011,
1583-
title={Bayesian Regularization Applied to Ultrasound Strain Imaging},
1584-
volume={58},
1585-
ISSN={1558-2531},
1586-
url={https//dx.doi.org/10.1109/TBME.2011.2106500},
1587-
DOI={10.1109/tbme.2011.2106500},
1588-
number={6},
1589-
journal={IEEE Transactions on Biomedical Engineering},
1590-
publisher={Institute of Electrical and Electronics Engineers (IEEE)},
1591-
author={McCormick, M and Rubert, N and Varghese, T},
1592-
year={2011},
1593-
month=jun, pages={1612–1620} }
1594-
@article{McCormick_2014,
1595-
title={ITK: enabling reproducible research and open science},
1596-
volume={8},
1597-
ISSN={1662-5196},
1598-
url={https//dx.doi.org/10.3389/fninf.2014.00013},
1599-
DOI={10.3389/fninf.2014.00013},
1600-
journal={Frontiers in Neuroinformatics},
1601-
publisher={Frontiers Media SA},
1602-
author={McCormick, Matthew and Liu, Xiaoxiao and Jomier, Julien and Marion, Charles and Ibanez, Luis},
1603-
year={2014} }
1552+
16041553
@article{Tustison_2005,
16051554
title={N-D $C^k$ B-Spline Scattered Data Approximation},
16061555
ISSN={2327-770X},
@@ -1611,16 +1560,6 @@ @article{Tustison_2005
16111560
author={Tustison, Nicholas J. and Gee, James},
16121561
year={2005},
16131562
month=nov }
1614-
@article{Hernandez_Cerdan_2016,
1615-
title={Isotropic and Steerable Wavelets in N Dimensions. A multiresolution analysis framework.},
1616-
ISSN={2327-770X},
1617-
url={https//dx.doi.org/10.54294/0e1c0748fe24},
1618-
DOI={10.54294/0e1c0748fe24},
1619-
journal={The Insight Journal},
1620-
publisher={NumFOCUS - Insight Software Consortium (ITK)},
1621-
author={Hernandez-Cerdan, Pablo},
1622-
year={2016},
1623-
month=jul }
16241563
@article{Lehmann_2010_b,
16251564
title={FFT based convolution},
16261565
ISSN={2327-770X},
@@ -1651,18 +1590,8 @@ @article{Tustison_2009_d
16511590
author={Tustison, Nicholas J. and Gee, James},
16521591
year={2009},
16531592
month=dec }
1654-
@article{Mccormick_2017,
1655-
title={N-Dimensional Computation of Strain Tensor Images in the Insight Toolkit},
1656-
ISSN={2327-770X},
1657-
url={https//dx.doi.org/10.54294/1wtpo8},
1658-
DOI={10.54294/1wtpo8},
1659-
journal={The Insight Journal},
1660-
publisher={NumFOCUS - Insight Software Consortium (ITK)},
1661-
author={Mccormick, Matthew},
1662-
year={2017},
1663-
month=may }
16641593
@article{Mosaliganti_2009_a,
1665-
title={level set segmentation using coupled active surfaces},
1594+
title={Level set segmentation using coupled active surfaces},
16661595
ISSN={2327-770X},
16671596
url={https//dx.doi.org/10.54294/23ugmy},
16681597
DOI={10.54294/23ugmy},

Modules/Bridge/VtkGlue/include/itkViewImage.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ ViewImage<TImage>::View(const ImageType * img, const std::string & winTitle, siz
101101
cam->GetViewUp(vup);
102102
for (unsigned int i = 0; i < 3; ++i)
103103
{
104-
pos[i] = -pos[i];
105-
vup[i] = -vup[i];
104+
pos[i] *= -1;
105+
vup[i] *= -1;
106106
}
107107
cam->SetPosition(pos);
108108
cam->SetViewUp(vup);

Modules/Core/Common/include/itkAtanRegularizedHeavisideStepFunction.h

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,9 @@ namespace itk
2828
*
2929
* \author Mosaliganti K., Smith B., Gelas A., Gouaillard A., Megason S.
3030
*
31-
* This code was taken from the Insight Journal paper:
32-
*
33-
* "Cell Tracking using Coupled Active Surfaces for Nuclei and Membranes"
34-
* https://doi.org/10.54294/wvwmf8
35-
*
36-
* That is based on the papers:
37-
*
38-
* "Level Set Segmentation: Active Contours without edge"
39-
* https://doi.org/10.54294/8jk6oy
40-
*
41-
* and
42-
*
43-
* "Level set segmentation using coupled active surfaces"
44-
* https://doi.org/10.54294/23ugmy
45-
*
31+
* This code was taken from the Insight Journal paper \cite Mosaliganti_2009_c
32+
* that is based on the papers \cite Mosaliganti_2009_a and
33+
* \cite Mosaliganti_2009_b.
4634
*
4735
* \ingroup ITKCommon
4836
*/

Modules/Core/Common/include/itkDataObject.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ class ITKCommon_EXPORT DataObjectError : public ExceptionObject
5959
~DataObjectError() noexcept override = default;
6060

6161
/** Constructor. Needed to ensure the exception object can be copied. */
62-
DataObjectError(const char * file, unsigned int lineNumber);
63-
64-
/** Constructor. Needed to ensure the exception object can be copied. */
65-
DataObjectError(const std::string & file, unsigned int lineNumber);
62+
DataObjectError(std::string file, unsigned int lineNumber);
6663

6764
/** Copy constructor. Needed to ensure the exception object can be copied. */
6865
DataObjectError(const DataObjectError & orig) noexcept;
@@ -118,10 +115,7 @@ class ITKCommon_EXPORT InvalidRequestedRegionError : public DataObjectError
118115
~InvalidRequestedRegionError() noexcept override = default;
119116

120117
/** Constructor. Needed to ensure the exception object can be copied. */
121-
InvalidRequestedRegionError(const char * file, unsigned int lineNumber);
122-
123-
/** Constructor. Needed to ensure the exception object can be copied. */
124-
InvalidRequestedRegionError(const std::string & file, unsigned int lineNumber);
118+
InvalidRequestedRegionError(std::string file, unsigned int lineNumber);
125119

126120
/** Copy constructor. Needed to ensure the exception object can be copied. */
127121
InvalidRequestedRegionError(const InvalidRequestedRegionError & orig) noexcept;

Modules/Core/Common/include/itkExceptionObject.h

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,10 @@ class ITKCommon_EXPORT ExceptionObject : public std::exception
5656
/** Explicitly-defaulted default-constructor. Creates an empty exception object. */
5757
ExceptionObject() noexcept = default;
5858

59-
explicit ExceptionObject(const char * file,
60-
unsigned int lineNumber = 0,
61-
const char * desc = "None",
62-
const char * loc = "Unknown");
6359
explicit ExceptionObject(std::string file,
6460
unsigned int lineNumber = 0,
65-
std::string desc = "None",
66-
std::string loc = "Unknown");
61+
std::string description = "None",
62+
std::string location = {});
6763

6864
/** Copy-constructor. */
6965
ExceptionObject(const ExceptionObject &) noexcept = default;
@@ -133,7 +129,7 @@ class ITKCommon_EXPORT ExceptionObject : public std::exception
133129
private:
134130
class ExceptionData;
135131

136-
std::shared_ptr<const ExceptionData> m_ExceptionData{};
132+
std::shared_ptr<const ExceptionData> m_ExceptionData;
137133
};
138134

139135
/** Generic inserter operator for ExceptionObject and its subclasses. */
@@ -222,18 +218,9 @@ class ITKCommon_EXPORT ProcessAborted : public ExceptionObject
222218
}
223219

224220
/** Constructor. Needed to ensure the exception object can be copied. */
225-
ProcessAborted(const char * file, unsigned int lineNumber)
226-
: ExceptionObject(file, lineNumber)
227-
{
228-
this->SetDescription("Filter execution was aborted by an external request");
229-
}
230-
231-
/** Constructor. Needed to ensure the exception object can be copied. */
232-
ProcessAborted(const std::string & file, unsigned int lineNumber)
233-
: ExceptionObject(file, lineNumber)
234-
{
235-
this->SetDescription("Filter execution was aborted by an external request");
236-
}
221+
ProcessAborted(std::string file, unsigned int lineNumber)
222+
: ExceptionObject(std::move(file), lineNumber, "Filter execution was aborted by an external request")
223+
{}
237224

238225
/** \see LightObject::GetNameOfClass() */
239226
itkOverrideGetNameOfClassMacro(ProcessAborted);

Modules/Core/Common/include/itkHeavisideStepFunction.h

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,9 @@ namespace itk
3434
*
3535
* \author Mosaliganti K., Smith B., Gelas A., Gouaillard A., Megason S.
3636
*
37-
* This code was taken from the Insight Journal paper:
38-
*
39-
* "Cell Tracking using Coupled Active Surfaces for Nuclei and Membranes"
40-
* https://doi.org/10.54294/wvwmf8
41-
*
42-
* That is based on the papers:
43-
*
44-
* "Level Set Segmentation: Active Contours without edge"
45-
* https://doi.org/10.54294/8jk6oy
46-
*
47-
* and
48-
*
49-
* "Level set segmentation using coupled active surfaces"
50-
* https://doi.org/10.54294/23ugmy
51-
*
37+
* This code was taken from the Insight Journal paper \cite Mosaliganti_2009_c
38+
* that is based on the papers \cite Mosaliganti_2009_a and
39+
* \cite Mosaliganti_2009_b.
5240
*
5341
* \ingroup ITKCommon
5442
*/

Modules/Core/Common/include/itkHeavisideStepFunctionBase.h

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,9 @@ namespace itk
2929
*
3030
* \author Mosaliganti K., Smith B., Gelas A., Gouaillard A., Megason S.
3131
*
32-
* This code was taken from the Insight Journal paper:
33-
*
34-
* "Cell Tracking using Coupled Active Surfaces for Nuclei and Membranes"
35-
* https://doi.org/10.54294/wvwmf8
36-
*
37-
* That is based on the papers:
38-
*
39-
* "Level Set Segmentation: Active Contours without edge"
40-
* https://doi.org/10.54294/8jk6oy
41-
*
42-
* and
43-
*
44-
* "Level set segmentation using coupled active surfaces"
45-
* https://doi.org/10.54294/23ugmy
46-
*
32+
* This code was taken from the Insight Journal paper \cite Mosaliganti_2009_c
33+
* that is based on the papers \cite Mosaliganti_2009_a and
34+
* \cite Mosaliganti_2009_b.
4735
*
4836
* \ingroup ITKCommon
4937
*/

Modules/Core/Common/include/itkRegularizedHeavisideStepFunction.h

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,9 @@ namespace itk
2828
*
2929
* \author Mosaliganti K., Smith B., Gelas A., Gouaillard A., Megason S.
3030
*
31-
* This code was taken from the Insight Journal paper:
32-
*
33-
* "Cell Tracking using Coupled Active Surfaces for Nuclei and Membranes"
34-
* https://doi.org/10.54294/wvwmf8
35-
*
36-
* That is based on the papers:
37-
*
38-
* "Level Set Segmentation: Active Contours without edge"
39-
* https://doi.org/10.54294/8jk6oy
40-
*
41-
* and
42-
*
43-
* "Level set segmentation using coupled active surfaces"
44-
* https://doi.org/10.54294/23ugmy
45-
*
31+
* This code was taken from the Insight Journal paper \cite Mosaliganti_2009_c
32+
* that is based on the papers \cite Mosaliganti_2009_a and
33+
* \cite Mosaliganti_2009_b.
4634
*
4735
* \ingroup ITKCommon
4836
*/

0 commit comments

Comments
 (0)