Skip to content

Commit 1054ece

Browse files
tbirdsodzenanz
authored andcommitted
ENH: Bump ITK and replace http with https using script
1 parent 42b30ee commit 1054ece

11 files changed

Lines changed: 34 additions & 34 deletions

.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:
@@ -135,9 +135,9 @@ jobs:
135135
# strategy:
136136
# max-parallel: 2
137137
# matrix:
138-
# python-version: [35, 36, 37, 38]
138+
# python-version: [37, 38, 39, 310]
139139
# include:
140-
# - itk-python-git-tag: "v5.1.0.post2"
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.1.0.post2"
176+
# - itk-python-git-tag: "v5.3rc04"
177177
#
178178
# steps:
179179
# - uses: actions/checkout@v2
@@ -200,9 +200,9 @@ jobs:
200200
# strategy:
201201
# max-parallel: 2
202202
# matrix:
203-
# python-version-minor: [5, 6, 7, 8]
203+
# python-version-minor: [7, 8, 9, 10]
204204
# include:
205-
# - itk-python-git-tag: "v5.1.0.post2"
205+
# - itk-python-git-tag: "v5.3rc04"
206206
#
207207
# steps:
208208
# - uses: actions/checkout@v2
@@ -232,7 +232,7 @@ jobs:
232232
# run: |
233233
# cd ../../im
234234
# call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
235-
# set PATH="C:\P\grep;%PATH%"
235+
# set PATH=C:\P\grep;%PATH%
236236
# set CC=cl.exe
237237
# set CXX=cl.exe
238238
# 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"

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
__NB: This `scifio-imageio` provides the _C++_ side of SCIFIO-ITK integration. For the _Java_ side, see [scifio-itk-bridge](https://github.com/scifio/scifio-itk-bridge).__
66

77
This package provides an ImageIO plugin for the
8-
[Insight Toolkit](http://itk.org/) (ITK) that uses
8+
[Insight Toolkit](https://itk.org/) (ITK) that uses
99
[Bio-Formats](https://github.com/openmicroscopy/bioformats)
1010
to read and write supported file formats.
1111

@@ -28,21 +28,21 @@ The SCIFIO ImageIO plugin was developed by Gaetan Lehmann, Mark Hiner,
2828
Curtis Rueden, Melissa Linkert and Matt McCormick. Development of this
2929
module was funded in part by the
3030
[FARSIGHT project](http://farsight-toolkit.org/), as well as the
31-
[Open Microscopy Environment](http://openmicroscopy.org/).
31+
[Open Microscopy Environment](https://openmicroscopy.org/).
3232

3333
Special thanks to Alex Gouaillard, Sebastien Barre, Luis Ibanez and
3434
Jim Miller for fixes and suggestions.
3535

3636
## Prerequisites
3737

38-
You should have [CMake](http://www.cmake.org/) installed, to allow the
38+
You should have [CMake](https://www.cmake.org/) installed, to allow the
3939
configuration of ITK builds. If you want the latest ITK development build, you
40-
will need [Git](http://git-scm.com/) as well.
40+
will need [Git](https://git-scm.com/) as well.
4141

4242
## Installation
4343

4444
Simply download ITK from the [Kitware software
45-
page](http://www.itk.org/ITK/resources/software.html). Using CMake, set the
45+
page](https://www.itk.org/ITK/resources/software.html). Using CMake, set the
4646
following configuration flag:
4747
```
4848
Module_SCIFIO = ON
@@ -81,10 +81,10 @@ The programs are as follows:
8181
Reads an input image, and writes it out as a specified type
8282
* __itkRGBSCIFIOImageTest__:
8383
Same as itkSCIFIOImageIOTest but for
84-
[RGB](http://www.itk.org/Doxygen/html/classitk_1_1RGBPixel.html) types
84+
[RGB](https://www.itk.org/Doxygen/html/classitk_1_1RGBPixel.html) types
8585
* __itkVectorImageSCIFIOImageIOTest__:
8686
Same as itkSCIFIOImageIOTest but for
87-
[VectorImage](http://www.itk.org/Doxygen/html/classitk_1_1VectorImage.html)
87+
[VectorImage](https://www.itk.org/Doxygen/html/classitk_1_1VectorImage.html)
8888
type
8989

9090
For example, to convert a .czi image to a .tif, you would use:
@@ -95,10 +95,10 @@ SCIFIOTestDriver itkSCIFIOImageIOTest in.czi out.tif
9595
## Troubleshooting
9696

9797
For general troubleshooting issues using this plugin, please e-mail the
98-
[SCIFIO mailing list](http://scif.io/mailman/listinfo/scifio).
98+
[SCIFIO mailing list](https://scif.io/mailman/listinfo/scifio).
9999

100100
Any questions about the capabilities of Bio-Formats can be
101-
[directed to the OME team](http://www.openmicroscopy.org/site/community).
101+
[directed to the OME team](https://www.openmicroscopy.org/site/community).
102102

103103
For ITK questions, see the
104-
[ITK mailing lists](http://www.itk.org/ITK/help/mailing.html).
104+
[ITK mailing lists](https://www.itk.org/ITK/help/mailing.html).

include/itkSCIFIOImageIO.h

Lines changed: 4 additions & 4 deletions
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,
@@ -71,9 +71,9 @@ namespace itk
7171
* size, but also nice for tweaking the VM in many other ways (e.g.,
7272
* garbage collection settings).
7373
*
74-
* [scifio]: http://openmicroscopy.org/site/support/bio-formats/developers/scifio.html
75-
* [bio-formats]: http://openmicroscopy.org/site/products/bio-formats
76-
* [file formats]: http://openmicroscopy.org/site/support/bio-formats/formats
74+
* [scifio]: https://openmicroscopy.org/site/support/bio-formats/developers/scifio.html
75+
* [bio-formats]: https://openmicroscopy.org/site/products/bio-formats
76+
* [file formats]: https://openmicroscopy.org/site/support/bio-formats/formats
7777
*
7878
* \ingroup SCIFIO
7979
*/

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

src/itkSCIFIOImageIO.cxx.in

Lines changed: 2 additions & 2 deletions
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,
@@ -68,7 +68,7 @@ namespace
6868
* Splits a string into tokens using the given delimiter.
6969
*
7070
* Thanks to SO #236129 for this solution:
71-
* http://stackoverflow.com/a/236803
71+
* https://stackoverflow.com/a/236803
7272
*/
7373
std::vector<std::string> &split( const std::string &s, char delim,
7474
std::vector<std::string> &elems )

src/itkSCIFIOImageIOFactory.cxx

Lines changed: 2 additions & 2 deletions
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,
@@ -41,7 +41,7 @@ SCIFIOImageIOFactory::GetDescription() const
4141
{
4242
return "SCIFIO ImageIO Factory, allows the loading of "
4343
"SCIFIO-compatible images into Insight; see "
44-
"http://openmicroscopy.org/site/support/bio-formats/users/itk";
44+
"https://openmicroscopy.org/site/support/bio-formats/users/itk";
4545
}
4646

4747
// Undocumented API used to register during static initialization.

test/itkRGBSCIFIOImageIOTest.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,

test/itkSCIFIOImageIOTest.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,

test/itkSCIFIOImageInfoTest.cxx

Lines changed: 2 additions & 2 deletions
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,
@@ -51,7 +51,7 @@ namespace
5151
* Splits a string into tokens using the given delimiter.
5252
*
5353
* Thanks to SO #236129 for this solution:
54-
* http://stackoverflow.com/a/236803
54+
* https://stackoverflow.com/a/236803
5555
*/
5656
std::vector<std::string> &
5757
split(const std::string & s, char delim, std::vector<std::string> & elems)

0 commit comments

Comments
 (0)