diff --git a/.clang-format b/.clang-format index 399e250..411b009 100644 --- a/.clang-format +++ b/.clang-format @@ -4,7 +4,7 @@ ## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option ## ## The clang-format binaries can be downloaded as part of the clang binary distributions -## from http://releases.llvm.org/download.html +## from https://releases.llvm.org/download.html ## ## Use the script Utilities/Maintenance/clang-format.bash to faciliate ## maintaining a consistent code style. diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index e4aaf71..09727af 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -13,17 +13,17 @@ jobs: - os: ubuntu-18.04 c-compiler: "gcc" cxx-compiler: "g++" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" - os: windows-2019 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "Release" - os: macos-10.15 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" steps: @@ -134,9 +134,9 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: [36, 37, 38, 39] + python-version: [37, 38, 39, 310] include: - - itk-python-git-tag: "v5.2.0.post2" + - itk-python-git-tag: "v5.3rc04" steps: - uses: actions/checkout@v2 @@ -172,7 +172,7 @@ jobs: max-parallel: 2 matrix: include: - - itk-python-git-tag: "v5.2.0.post2" + - itk-python-git-tag: "v5.3rc04" steps: - uses: actions/checkout@v2 @@ -206,9 +206,9 @@ jobs: strategy: max-parallel: 2 matrix: - python-version-minor: [6, 7, 8, 9] + python-version-minor: [7, 8, 9, 10] include: - - itk-python-git-tag: "v5.2.0.post2" + - itk-python-git-tag: "v5.3rc04" steps: - name: Get specific version of CMake, Ninja @@ -241,7 +241,7 @@ jobs: run: | cd ../../im call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - set PATH="C:\P\grep;%PATH%" + set PATH=C:\P\grep;%PATH% set CC=cl.exe set CXX=cl.exe 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 diff --git a/LICENSE b/LICENSE index d645695..62589ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -193,7 +193,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/Old/LinearAnisotropicDiffusionTest.cxx b/Old/LinearAnisotropicDiffusionTest.cxx index 74ffa20..63761e7 100644 --- a/Old/LinearAnisotropicDiffusionTest.cxx +++ b/Old/LinearAnisotropicDiffusionTest.cxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/README.rst b/README.rst index a485f0b..24c6f8b 100644 --- a/README.rst +++ b/README.rst @@ -11,16 +11,16 @@ ITKAnisotropicDiffusionLBR :target: https://github.com/InsightSoftwareConsortium/ITKAnisotropicDiffusionLBR/blob/master/LICENSE) :alt: License -This `ITK `_ module implements Anisotropic Diffusion, using Lattice Basis Reduction. +This `ITK `_ module implements Anisotropic Diffusion, using Lattice Basis Reduction. -Documentation can be found in the `Insight Journal article `_:: +Documentation can be found in the `Insight Journal article `_:: Mirebeau J., Fehrenbach J., Risser L., Tobji S. "Anisotropic Diffusion in ITK", The Insight Journal, January-December, 2014. - http://insight-journal.org/browse/publication/953 - http://hdl.handle.net/10380/3505 + https://insight-journal.org/browse/publication/953 + https://hdl.handle.net/10380/3505 To install the Python packages:: diff --git a/examples/CoherenceEnhancingDiffusion.cxx b/examples/CoherenceEnhancingDiffusion.cxx index 27b73cd..d515154 100644 --- a/examples/CoherenceEnhancingDiffusion.cxx +++ b/examples/CoherenceEnhancingDiffusion.cxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/CoherenceEnhancingDiffusionCommandLine.h b/include/CoherenceEnhancingDiffusionCommandLine.h index b9b4a92..a570cba 100644 --- a/include/CoherenceEnhancingDiffusionCommandLine.h +++ b/include/CoherenceEnhancingDiffusionCommandLine.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/LinearAnisotropicDiffusionCommandLine.h b/include/LinearAnisotropicDiffusionCommandLine.h index 4c22ba5..e3ff2a0 100644 --- a/include/LinearAnisotropicDiffusionCommandLine.h +++ b/include/LinearAnisotropicDiffusionCommandLine.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkAnisotropicDiffusionLBRImageFilter.h b/include/itkAnisotropicDiffusionLBRImageFilter.h index 28f9854..0e25df0 100644 --- a/include/itkAnisotropicDiffusionLBRImageFilter.h +++ b/include/itkAnisotropicDiffusionLBRImageFilter.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkAnisotropicDiffusionLBRImageFilter.hxx b/include/itkAnisotropicDiffusionLBRImageFilter.hxx index 19064cc..be95e55 100644 --- a/include/itkAnisotropicDiffusionLBRImageFilter.hxx +++ b/include/itkAnisotropicDiffusionLBRImageFilter.hxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkAnisotropicDiffusionLBRMacro.h b/include/itkAnisotropicDiffusionLBRMacro.h index 5e470f7..6917ec9 100644 --- a/include/itkAnisotropicDiffusionLBRMacro.h +++ b/include/itkAnisotropicDiffusionLBRMacro.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkCoherenceEnhancingDiffusionImageFilter.h b/include/itkCoherenceEnhancingDiffusionImageFilter.h index 0dfe67e..e328b23 100644 --- a/include/itkCoherenceEnhancingDiffusionImageFilter.h +++ b/include/itkCoherenceEnhancingDiffusionImageFilter.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkCoherenceEnhancingDiffusionImageFilter.hxx b/include/itkCoherenceEnhancingDiffusionImageFilter.hxx index ef92053..1e00bb7 100644 --- a/include/itkCoherenceEnhancingDiffusionImageFilter.hxx +++ b/include/itkCoherenceEnhancingDiffusionImageFilter.hxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkLinearAnisotropicDiffusionLBRImageFilter.h b/include/itkLinearAnisotropicDiffusionLBRImageFilter.h index 57af8f6..4098234 100644 --- a/include/itkLinearAnisotropicDiffusionLBRImageFilter.h +++ b/include/itkLinearAnisotropicDiffusionLBRImageFilter.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkLinearAnisotropicDiffusionLBRImageFilter.hxx b/include/itkLinearAnisotropicDiffusionLBRImageFilter.hxx index dd91800..576debf 100644 --- a/include/itkLinearAnisotropicDiffusionLBRImageFilter.hxx +++ b/include/itkLinearAnisotropicDiffusionLBRImageFilter.hxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkStructureTensorImageFilter.h b/include/itkStructureTensorImageFilter.h index b4621c0..6a18980 100644 --- a/include/itkStructureTensorImageFilter.h +++ b/include/itkStructureTensorImageFilter.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkStructureTensorImageFilter.hxx b/include/itkStructureTensorImageFilter.hxx index 11dc838..82e8d64 100644 --- a/include/itkStructureTensorImageFilter.hxx +++ b/include/itkStructureTensorImageFilter.hxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkUnaryFunctorWithIndexImageFilter.h b/include/itkUnaryFunctorWithIndexImageFilter.h index c490778..2193801 100644 --- a/include/itkUnaryFunctorWithIndexImageFilter.h +++ b/include/itkUnaryFunctorWithIndexImageFilter.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/setup.py b/setup.py index e265fed..c9d6b03 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ 'using Lattice Basis Reduction. For more information, see ' 'Mirebeau J., Fehrenbach J., Risser L., Tobji S. ' '"Anisotropic Diffusion in ITK" ' - 'http://insight-journal.org/browse/publication/953 ' - 'http://hdl.handle.net/10380/3505 ', + 'https://insight-journal.org/browse/publication/953 ' + 'https://hdl.handle.net/10380/3505 ', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/test/CoherenceEnhancingDiffusionTest.cxx b/test/CoherenceEnhancingDiffusionTest.cxx index 6d5f8c7..d2465ca 100644 --- a/test/CoherenceEnhancingDiffusionTest.cxx +++ b/test/CoherenceEnhancingDiffusionTest.cxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS,