Skip to content

Commit dbe1d9e

Browse files
tbirdsodzenanz
authored andcommitted
ENH: Bump ITK version and apply http to https reformatting
1 parent e518b40 commit dbe1d9e

13 files changed

+41
-41
lines changed

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

Lines changed: 7 additions & 7 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: "v5.3rc03"
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: "v5.3rc03"
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: "v5.3rc03"
26+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -137,7 +137,7 @@ jobs:
137137
matrix:
138138
python-version: [37, 38, 39, 310]
139139
include:
140-
- itk-python-git-tag: "v5.3rc03"
140+
- itk-python-git-tag: "v5.3rc04"
141141

142142
steps:
143143
- uses: actions/checkout@v2
@@ -173,7 +173,7 @@ jobs:
173173
max-parallel: 2
174174
matrix:
175175
include:
176-
- itk-python-git-tag: "v5.3rc03"
176+
- itk-python-git-tag: "v5.3rc04"
177177

178178
steps:
179179
- uses: actions/checkout@v2
@@ -209,7 +209,7 @@ jobs:
209209
matrix:
210210
python-version-minor: [7, 8, 9, 10]
211211
include:
212-
- itk-python-git-tag: "v5.3rc03"
212+
- itk-python-git-tag: "v5.3rc04"
213213

214214
steps:
215215
- name: Get specific version of CMake, Ninja
@@ -242,7 +242,7 @@ jobs:
242242
run: |
243243
cd ../../im
244244
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
245-
set PATH="C:\P\grep;%PATH%"
245+
set PATH=C:\P\grep;%PATH%
246246
set CC=cl.exe
247247
set CXX=cl.exe
248248
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,6 +1,6 @@
11
Apache License
22
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
3+
https://www.apache.org/licenses/
44

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

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

195-
http://www.apache.org/licenses/LICENSE-2.0
195+
https://www.apache.org/licenses/LICENSE-2.0
196196

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

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ITKMorphologicalContourInterpolation
1414
Overview
1515
--------
1616

17-
An `ITK <http://itk.org>`_-based implementation of morphological contour
17+
An `ITK <https://itk.org>`_-based implementation of morphological contour
1818
interpolation based off the paper:
1919

2020
Albu AB1, Beugeling T, Laurendeau D.
@@ -24,13 +24,13 @@ interpolation based off the paper:
2424
doi: 10.1109/TBME.2008.921158.
2525

2626
Documentation can be found in the `Insight Journal article
27-
<http://www.insight-journal.org/browse/publication/977>`_::
27+
<https://www.insight-journal.org/browse/publication/977>`_::
2828

2929
Zukić D., Vicory J., McCormick M., Wisse L., Gerig G., Yushkevich P., Aylward S.
3030
"ND Morphological Contour Interpolation",
3131
The Insight Journal. January-December, 2016.
32-
http://hdl.handle.net/10380/3563
33-
http://insight-journal.org/browse/publication/977
32+
https://hdl.handle.net/10380/3563
33+
https://insight-journal.org/browse/publication/977
3434

3535
Installation
3636
------------

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: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @InProceedings{Whitaker1994c
3535

3636
@Manual{POVRay,
3737
Title = "Persistence of Vision, Ray-Tracer",
38-
Address = "http://www.povray.org",
38+
Address = "https://www.povray.org",
3939
}
4040

4141
@Book{Romeny1994,
@@ -55,7 +55,7 @@ @Book{ToErrIsHuman2001
5555
@TechReport{Aisemberg,
5656
Author = "G.O. Aisemberg",
5757
Title = "Vertebrate embryology",
58-
Address = "http://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
58+
Address = "https://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
5959
Institution = "Department of Biological Sciences. Lehman College,
6060
City University of New York",
6161
year = 1998,
@@ -758,7 +758,7 @@ @TechReport{Culver1999
758758
Title = "Intrinsic scale for boundary representation of
759759
two-dimensional objects",
760760
Institution = "MIDAG, University of North Carolina at Chapel Hill",
761-
annote = "http://www.cs.unc.edu/~culver",
761+
annote = "https://www.cs.unc.edu/~culver",
762762
year = 1999,
763763
}
764764

@@ -832,7 +832,7 @@ @TechReport{Deriche1993
832832
@Book{Darwin1999,
833833
Author = "C. Darwin",
834834
Title = "On the Origin of Species",
835-
Publisher = "http://www.gutenberg.org",
835+
Publisher = "https://www.gutenberg.org",
836836
Edition = "sixth",
837837
year = 1999,
838838
}
@@ -1796,8 +1796,8 @@ @Manual{ITKSoftwareGuide
17961796
Title = {The {ITK} {S}oftware {G}uide},
17971797
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
17981798
Organization = "Kitware, Inc. ISBN 1-930934-10-6",
1799-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
1800-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
1799+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
1800+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
18011801
Publisher = {Kitware Inc.},
18021802
Edition = {First},
18031803
year = 2003,
@@ -1807,8 +1807,8 @@ @Manual{ITKSoftwareGuideSecondEdition
18071807
Title = {The {ITK} {S}oftware {G}uide},
18081808
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
18091809
Organization = "Kitware, Inc. ISBN 1-930934-15-7",
1810-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
1811-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
1810+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
1811+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
18121812
Publisher = {Kitware Inc.},
18131813
Edition = {Second},
18141814
year = 2005,
@@ -3469,7 +3469,7 @@ @Manual{OpenGLSpecification
34693469
Title = "The OpenGL Graphics System: A Specification (Version
34703470
1.2)",
34713471
Author = "M. Segal and K. Akeley",
3472-
Address = "http://www.opengl.org",
3472+
Address = "https://www.opengl.org",
34733473
month = "march",
34743474
year = 1998,
34753475
}
@@ -3887,7 +3887,7 @@ @TechReport{Udupa1998
38873887
Author = "J. K. Udupa and S. Samarasekera",
38883888
Title = "Extraction of fuzzy object information in multidimensional images for quantifying MS lesions of the brain",
38893889
year = 1998,
3890-
Institution = "United States Patent Office http://www.uspto.gov",
3890+
Institution = "United States Patent Office https://www.uspto.gov",
38913891
Number = "5,812,691"
38923892
}
38933893

@@ -4782,7 +4782,7 @@ @Manual{CreatisINSA-Lyon
47824782
Title = "The GDCM Library",
47834783
Institution = "CREATIS (France)",
47844784
Organization = "CNRS, INSERM, INSA Lyon, UCB Lyon",
4785-
Address = "http://www.creatis.insa-lyon.fr/Public/Gdcm/"
4785+
Address = "https://www.creatis.insa-lyon.fr/Public/Gdcm/"
47864786
}
47874787

47884788
@InProceedings{Chung2002,
@@ -4805,7 +4805,7 @@ @TechReport{DICOMStandard
48054805
Author = "NEMA",
48064806
Title = "The DICOM Standard",
48074807
Institution = "NEMA",
4808-
Address = "\url{http://dicom.nema.org/}",
4808+
Address = "\url{https://dicom.nema.org/}",
48094809
Publisher = "National Electical Manufacturers Association",
48104810
Year = 2014
48114811
}
@@ -4833,7 +4833,7 @@ @Manual{OpenJPEG
48334833
Title = "OpenJPEG",
48344834
Institution = "Communications and Remote Sensing Laboratory (TELE)",
48354835
Organization = "Universit\'{e} Catholique de Louvain (UCL), Belgium",
4836-
Address = "http://www.openjpeg.org"
4836+
Address = "https://www.openjpeg.org"
48374837
}
48384838

48394839
@TechReport{JPEG2000KeyAdvantages,
@@ -4842,7 +4842,7 @@ @TechReport{JPEG2000KeyAdvantages
48424842
Institution = "Aware Inc.",
48434843
Year = 2002,
48444844
Month = "February",
4845-
Address = "http://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc"
4845+
Address = "https://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc"
48464846
}
48474847

48484848
@inproceedings{ marcellin00overview,
@@ -4857,7 +4857,7 @@ @misc{ wikiRLE
48574857
author = "Wikipedia",
48584858
title = "{Run-length encoding} --- {W}ikipedia{,} The Free Encyclopedia",
48594859
year = "2016",
4860-
howpublished = {\url{http://en.wikipedia.org/w/index.php?title=Run-length\%20encoding&oldid=729616046}},
4860+
howpublished = {\url{https://en.wikipedia.org/w/index.php?title=Run-length\%20encoding&oldid=729616046}},
48614861
note = "[Online; accessed 29-July-2016]"
48624862
}
48634863

@@ -4880,7 +4880,7 @@ @Article{Lehmann2007
48804880
Author = "Ga{\"e}tan Lehmann",
48814881
Title = "Label object representation and manipulation with {ITK}",
48824882
Journal = "Insight Journal",
4883-
howpublished = "\url{http://hdl.handle.net/1926/584}",
4883+
howpublished = "\url{https://hdl.handle.net/1926/584}",
48844884
Year = 2007,
48854885
Month = 08,
48864886
Language = en,

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]{

include/itkMorphologicalContourInterpolator.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/itkMorphologicalContourInterpolator.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,

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'Please refer to:\n'
2626
'Zukić Dž., Vicory J., McCormick M., Wisse L., Gerig G., Yushkevich P., Aylward S. '
2727
'"nD Morphological Contour Interpolation", '
28-
'Insight Journal, January-December 2016, http://hdl.handle.net/10380/3563.',
28+
'Insight Journal, January-December 2016, https://hdl.handle.net/10380/3563.',
2929
classifiers=[
3030
"License :: OSI Approved :: Apache Software License",
3131
"Programming Language :: Python",

test/dscComparison.cxx

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)