Skip to content

Commit b75d9da

Browse files
tbirdsodzenanz
tbirdso
authored and
dzenanz
committed
ENH: Bump ITK and change http to https
1 parent 8ff5106 commit b75d9da

29 files changed

+56
-56
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 9 additions & 9 deletions
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.post3"
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.post3"
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.post3"
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Overview
1010
This repository contains `ITK <https://itk.org>`_ filters to estimate
1111
texture feature maps from N-dimensional images.
1212

13-
For more information, see the `Insight Journal article <http://hdl.handle.net/10380/3574>`_::
13+
For more information, see the `Insight Journal article <https://hdl.handle.net/10380/3574>`_::
1414

1515
Vimort J., McCormick M., Budin F., Paniagua B.
1616
Computing Textural Feature Maps for N-Dimensional images
1717
McCormick M.
1818
The Insight Journal. January-December. 2017.
19-
http://hdl.handle.net/10380/3574
20-
http://insight-journal.org/browse/publication/985
19+
https://hdl.handle.net/10380/3574
20+
https://insight-journal.org/browse/publication/985
2121

2222
Installation
2323
------------

‎doc/InsightArticle.cls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676

7777
% Define command to make reference to on-line Doxygen documentation
7878
\newcommand{\doxygen}[1]{
79-
\href{http://www.itk.org/Doxygen/html/classitk_1_1#1.html}{\code{itk::#1}}}
79+
\href{https://www.itk.org/Doxygen/html/classitk_1_1#1.html}{\code{itk::#1}}}
8080

8181
% Define command to make reference to on-line Doxygen documentation
8282
\newcommand{\subdoxygen}[2]{
83-
\href{http://www.itk.org/Doxygen/html/classitk_1_1#1_1_1#2.html}{\code{itk::#1::#2}}}
83+
\href{https://www.itk.org/Doxygen/html/classitk_1_1#1_1_1#2.html}{\code{itk::#1::#2}}}
8484

8585
% Define command for the standard comment introducing classes with similar functionalities
8686
\newcommand{\relatedClasses}{

‎doc/InsightJournal.bib‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ @InProceedings{Whitaker1994c
109109

110110
@Manual{POVRay,
111111
Title = "Persistence of Vision, Ray-Tracer",
112-
Address = "http://www.povray.org",
112+
Address = "https://www.povray.org",
113113
}
114114

115115
@Book{Romeny1994,
@@ -129,7 +129,7 @@ @Book{ToErrIsHuman2001
129129
@TechReport{Aisemberg,
130130
Author = "G.O. Aisemberg",
131131
Title = "Vertebrate embryology",
132-
Address = "http://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
132+
Address = "https://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
133133
Institution = "Department of Biological Sciences. Lehman College,
134134
City University of New York",
135135
year = 1998,
@@ -832,7 +832,7 @@ @TechReport{Culver1999
832832
Title = "Intrinsic scale for boundary representation of
833833
two-dimensional objects",
834834
Institution = "MIDAG, University of North Carolina at Chapel Hill",
835-
annote = "http://www.cs.unc.edu/~culver",
835+
annote = "https://www.cs.unc.edu/~culver",
836836
year = 1999,
837837
}
838838

@@ -906,7 +906,7 @@ @TechReport{Deriche1993
906906
@Book{Darwin1999,
907907
Author = "C. Darwin",
908908
Title = "On the Origin of Species",
909-
Publisher = "http://www.gutenberg.org",
909+
Publisher = "https://www.gutenberg.org",
910910
Edition = "sixth",
911911
year = 1999,
912912
}
@@ -1870,8 +1870,8 @@ @Manual{ITKSoftwareGuide
18701870
Title = {The {ITK} {S}oftware {G}uide},
18711871
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
18721872
Organization = "Kitware, Inc. ISBN 1-930934-10-6",
1873-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
1874-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
1873+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
1874+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
18751875
Publisher = {Kitware Inc.},
18761876
Edition = {First},
18771877
year = 2003,
@@ -1881,8 +1881,8 @@ @Manual{ITKSoftwareGuideSecondEdition
18811881
Title = {The {ITK} {S}oftware {G}uide},
18821882
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
18831883
Organization = "Kitware, Inc. ISBN 1-930934-15-7",
1884-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
1885-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
1884+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
1885+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
18861886
Publisher = {Kitware Inc.},
18871887
Edition = {Second},
18881888
year = 2005,
@@ -3543,7 +3543,7 @@ @Manual{OpenGLSpecification
35433543
Title = "The OpenGL Graphics System: A Specification (Version
35443544
1.2)",
35453545
Author = "M. Segal and K. Akeley",
3546-
Address = "http://www.opengl.org",
3546+
Address = "https://www.opengl.org",
35473547
month = "march",
35483548
year = 1998,
35493549
}
@@ -3961,7 +3961,7 @@ @TechReport{Udupa1998
39613961
Author = "J. K. Udupa and S. Samarasekera",
39623962
Title = "Extraction of fuzzy object information in multidimensional images for quantifying MS lesions of the brain",
39633963
year = 1998,
3964-
Institution = "United States Patent Office http://www.uspto.gov",
3964+
Institution = "United States Patent Office https://www.uspto.gov",
39653965
Number = "5,812,691"
39663966
}
39673967

@@ -4856,7 +4856,7 @@ @Manual{CreatisINSA-Lyon
48564856
Title = "The GDCM Library",
48574857
Institution = "CREATIS (France)",
48584858
Organization = "CNRS, INSERM, INSA Lyon, UCB Lyon",
4859-
Address = "http://www.creatis.insa-lyon.fr/Public/Gdcm/"
4859+
Address = "https://www.creatis.insa-lyon.fr/Public/Gdcm/"
48604860
}
48614861

48624862
@InProceedings{Chung2002,
@@ -4879,7 +4879,7 @@ @TechReport{DICOMStandard
48794879
Author = "NEMA",
48804880
Title = "The DICOM Standard",
48814881
Institution = "NEMA",
4882-
Address = "\url{http://dicom.nema.org/}",
4882+
Address = "\url{https://dicom.nema.org/}",
48834883
Publisher = "National Electical Manufacturers Association",
48844884
Year = 2014
48854885
}
@@ -4907,7 +4907,7 @@ @Manual{OpenJPEG
49074907
Title = "OpenJPEG",
49084908
Institution = "Communications and Remote Sensing Laboratory (TELE)",
49094909
Organization = "Universit\'{e} Catholique de Louvain (UCL), Belgium",
4910-
Address = "http://www.openjpeg.org"
4910+
Address = "https://www.openjpeg.org"
49114911
}
49124912

49134913
@TechReport{JPEG2000KeyAdvantages,
@@ -4916,7 +4916,7 @@ @TechReport{JPEG2000KeyAdvantages
49164916
Institution = "Aware Inc.",
49174917
Year = 2002,
49184918
Month = "February",
4919-
Address = "http://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc"
4919+
Address = "https://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc"
49204920
}
49214921

49224922
@inproceedings{ marcellin00overview,

‎doc/InsightJournal.sty‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,11 +1108,11 @@
11081108
% Commands for adding the link reference to the URL in the Insight Journal
11091109
%
11101110
\newcommand{\urlhandle}[1]{
1111-
\url{http://hdl.handle.net/10380/#1}}
1111+
\url{https://hdl.handle.net/10380/#1}}
11121112

11131113
\newcommand{\IJhandle}[1]{
1114-
Latest version available at the \href{http://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\
1115-
Distributed under \href{http://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}}
1114+
Latest version available at the \href{https://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\
1115+
Distributed under \href{https://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}}
11161116

11171117
\newcommand{\IJhandlefooter}[1]{
11181118
\fancyfoot[CO,CE]{

‎doc/itkTextureFeature.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
% of the standard documentation for Insight. It may be found online
55
% at:
66
%
7-
% http://www.itk.org/
7+
% https://www.itk.org/
88

99
\documentclass{InsightArticle}
1010

‎include/itkCoocurrenceTextureFeaturesImageFilter.h‎

Lines changed: 1 addition & 1 deletion
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/itkCoocurrenceTextureFeaturesImageFilter.hxx‎

Lines changed: 1 addition & 1 deletion
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)