Skip to content

Commit d311ed3

Browse files
committed
ENH: Bump ITK and replace http with https using script
1 parent 6b09611 commit d311ed3

12 files changed

+27
-27
lines changed

.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option
55
##
66
## The clang-format binaries can be downloaded as part of the clang binary distributions
7-
## from http://releases.llvm.org/download.html
7+
## from https://releases.llvm.org/download.html
88
##
99
## Use the script Utilities/Maintenance/clang-format.bash to faciliate
1010
## maintaining a consistent code style.

.github/workflows/build-test-package.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
- os: ubuntu-18.04
1414
c-compiler: "gcc"
1515
cxx-compiler: "g++"
16-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
16+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
1717
cmake-build-type: "MinSizeRel"
1818
- os: windows-2019
1919
c-compiler: "cl.exe"
2020
cxx-compiler: "cl.exe"
21-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
21+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
2222
cmake-build-type: "Release"
2323
- os: macos-10.15
2424
c-compiler: "clang"
2525
cxx-compiler: "clang++"
26-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
26+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -134,9 +134,9 @@ jobs:
134134
strategy:
135135
max-parallel: 2
136136
matrix:
137-
python-version: [36, 37, 38, 39]
137+
python-version: [37, 38, 39, 310]
138138
include:
139-
- itk-python-git-tag: "v5.2.0"
139+
- itk-python-git-tag: "v5.3rc04"
140140

141141
steps:
142142
- uses: actions/checkout@v2
@@ -172,7 +172,7 @@ jobs:
172172
max-parallel: 2
173173
matrix:
174174
include:
175-
- itk-python-git-tag: "v5.2.0"
175+
- itk-python-git-tag: "v5.3rc04"
176176

177177
steps:
178178
- uses: actions/checkout@v2
@@ -206,9 +206,9 @@ jobs:
206206
strategy:
207207
max-parallel: 2
208208
matrix:
209-
python-version-minor: [6, 7, 8, 9]
209+
python-version-minor: [7, 8, 9, 10]
210210
include:
211-
- itk-python-git-tag: "v5.2.0"
211+
- itk-python-git-tag: "v5.3rc04"
212212

213213
steps:
214214
- name: Get specific version of CMake, Ninja
@@ -241,7 +241,7 @@ jobs:
241241
run: |
242242
cd ../../im
243243
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
244-
set PATH="C:\P\grep;%PATH%"
244+
set PATH=C:\P\grep;%PATH%
245245
set CC=cl.exe
246246
set CXX=cl.exe
247247
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Apache License
33
Version 2.0, January 2004
4-
http://www.apache.org/licenses/
4+
https://www.apache.org/licenses/
55

66
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
77

@@ -193,7 +193,7 @@
193193
you may not use this file except in compliance with the License.
194194
You may obtain a copy of the License at
195195

196-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
197197

198198
Unless required by applicable law or agreed to in writing, software
199199
distributed under the License is distributed on an "AS IS" BASIS,

README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ The original approach is improved by projecting the vertices of each cuberille
2222
onto the implicit surface, smoothing the typical block-like resultant mesh.
2323

2424
A more detailed description can be found in the
25-
`Insight Journal article <http://hdl.handle.net/10380/3186>`_::
25+
`Insight Journal article <https://hdl.handle.net/10380/3186>`_::
2626

2727
Mueller, D. "Cuberille Implicit Surface Polygonization for ITK"
28-
http://hdl.handle.net/10380/3186
29-
http://www.insight-journal.org/browse/publication/740
28+
https://hdl.handle.net/10380/3186
29+
https://www.insight-journal.org/browse/publication/740
3030
July 20, 2010.
3131

3232
Installation

examples/examples.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

include/itkCuberilleImageToMeshFilter.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -101,10 +101,10 @@ namespace itk
101101
* [2] D. Gordon and J.K. Udupa, "Fast surface tracking in Three-dimensional
102102
Binary Images", Computer Vision, Graphics and Image Processing,
103103
Volume 45, Pages 196-214, 1989.
104-
* [3] http://www2.imm.dtu.dk/~jab/gallery/polygonization.html
104+
* [3] https://www2.imm.dtu.dk/~jab/gallery/polygonization.html
105105
*
106106
* This implementation was taken from the Insight Journal:
107-
* http://hdl.handle.net/10380/3186
107+
* https://hdl.handle.net/10380/3186
108108
*
109109
* \author Dan Mueller, Philips Healthcare, dan dot muel at gmail dot com
110110
*

include/itkCuberilleImageToMeshFilter.hxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -93,7 +93,7 @@ CuberilleImageToMeshFilter<TInputImage, TOutputMesh, TInterpolator>::GenerateDat
9393

9494
// TODO: Estimate number of vertices/faces for which to reserve
9595
// TODO: There is an issue with quad edge mesh related to reserving, see
96-
// http://www.itk.org/mailman/private/insight-developers/2010-June/014653.html
96+
// https://www.itk.org/mailman/private/insight-developers/2010-June/014653.html
9797
// SizeType size = image->GetLargestPossibleRegion().GetSize();
9898
// mesh->GetPoints()->Reserve( (size[0]*size[1]*size[2]) / 200 );
9999
// mesh->GetCells()->Reserve( (size[0]*size[1]*size[2]) / 100 );

itk-module.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ resultant mesh.
99
A more detailed description can be found in the Insight Journal article:
1010
1111
Mueller, D. \"Cuberille Implicit Surface Polygonization for ITK\"
12-
http://hdl.handle.net/10380/3186
13-
http://www.insight-journal.org/browse/publication/740
12+
https://hdl.handle.net/10380/3186
13+
https://www.insight-journal.org/browse/publication/740
1414
July 20, 2010.
1515
")
1616

test/CuberilleTest01.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

test/CuberilleTest02.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

test/CuberilleTest03.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

test/CuberilleTest04.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)