diff --git a/.editorconfig b/.editorconfig index de10f1f96..1daf8ea28 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,6 @@ root = true # Apply to any source file [*.*] -# Indentation of two spaces +# Indentation of two spaces indent_style = space indent_size = 2 diff --git a/.github/workflows/ElastixGitHubActions.yml b/.github/workflows/ElastixGitHubActions.yml index 2da9436e7..419eb5983 100644 --- a/.github/workflows/ElastixGitHubActions.yml +++ b/.github/workflows/ElastixGitHubActions.yml @@ -1,7 +1,7 @@ name: Elastix on: [push, pull_request] - + jobs: build: # The CMake configure and build commands are platform agnostic and should work equally @@ -30,7 +30,7 @@ jobs: ANNLib: "ANNlib-5.2.dll" vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" - os: macos-13 - c-compiler: "clang" + c-compiler: "clang" cxx-compiler: "clang++" itk-git-tag: "v5.4.1" cmake-build-type: "Release" @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@v3 - + - name: Make directory structure run: | items=(*) @@ -49,15 +49,15 @@ jobs: mv .clang-format Elastix-source mv Elastix-source/Dockerfile . shell: bash - + - uses: actions/cache@v3 id: cache with: path: | ITK-build ITK-source - key: ${{ matrix.itk-git-tag }}-${{ matrix.os }}-${{ matrix.cmake-build-type }} - + key: ${{ matrix.itk-git-tag }}-${{ matrix.os }}-${{ matrix.cmake-build-type }} + - name: Set up Python uses: actions/setup-python@v3 with: @@ -67,17 +67,17 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install ninja - + - name: Get specific version of CMake, Ninja uses: lukka/get-cmake@v3.24.2 - + - name: Download ITK if: steps.cache.outputs.cache-hit != 'true' run: | git clone https://github.com/InsightSoftwareConsortium/ITK.git ITK-source cd ITK-source git checkout ${{ matrix.itk-git-tag }} - + - name: Build ITK if: ${{ steps.cache.outputs.cache-hit != 'true' && !startsWith(matrix.os, 'windows') }} run: | @@ -85,7 +85,7 @@ jobs: cd ITK-build cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_EXAMPLES=OFF -DBUILD_TESTING:BOOL=OFF -DITK_LEGACY_REMOVE=ON -GNinja ../ITK-source ninja - + - name: Build ITK if: steps.cache.outputs.cache-hit != 'true' && startsWith(matrix.os, 'windows') run: | @@ -95,7 +95,7 @@ jobs: cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_EXAMPLES=OFF -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK-source ninja shell: cmd - + - name: Install requirements of PythonTests run: | python -m pip install -r ${{ github.workspace }}/Elastix-source/Testing/PythonTests/requirements.txt @@ -141,7 +141,7 @@ jobs: if: startsWith(matrix.os, 'macos') run: | ctest --output-on-failure -VV -j 2 -E "elastix_run_example_COMPARE_IM|elastix_run_3DCT_lung.MI.bspline.ASGD.001_COMPARE_TP|elastix_run_3DCT_lung.NMI.bspline.ASGD.001_COMPARE_TP" -S dashboard.cmake - + - name: Test Windows if: startsWith(matrix.os, 'windows') run: | @@ -153,7 +153,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') run: | ctest --output-on-failure -VV -j 2 -E "elastix_run_example_COMPARE_IM|elastix_run_3DCT_lung.MI.bspline.ASGD.001_COMPARE_TP" -S dashboard.cmake - + - name: Build externalproject example if: ${{ !startsWith(matrix.os, 'windows') }} run: | @@ -161,7 +161,7 @@ jobs: cd externalproject-build cmake -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE=${{ matrix.cmake-build-type }} -DElastix_DIR=${{ github.workspace }}/Elastix-build -GNinja ../Elastix-source/dox/externalproject ninja - + - name: Build externalproject example if: startsWith(matrix.os, 'windows') run: | @@ -183,7 +183,7 @@ jobs: set path=${{ github.workspace }}\Elastix-build\bin externalproject-build\elastix_translation_example.exe shell: cmd - + - name: Prepare Artifacts Unix if: ${{ !startsWith(matrix.os, 'windows') }} shell: bash @@ -199,7 +199,7 @@ jobs: mv Elastix-source/LICENSE uploads mv bin uploads mv lib uploads - + - name: Prepare Artifacts Windows if: startsWith(matrix.os, 'windows') shell: bash @@ -210,13 +210,13 @@ jobs: mv Elastix-build/bin/elastix.exe uploads mv Elastix-build/bin/transformix.exe uploads mv Elastix-build/bin/${{ matrix.ANNLib }} uploads - + - name: Publish Artifacts uses: actions/upload-artifact@v4.4.3 - with: + with: name: "${{ matrix.os }}" path: uploads - + - name: Login to Docker Hub if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startsWith(matrix.os, 'ubuntu') uses: docker/login-action@v1 @@ -225,11 +225,9 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build and push - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startsWith(matrix.os, 'ubuntu') + if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startsWith(matrix.os, 'ubuntu') run: | mkdir output docker build -t superelastix/elastix:${GITHUB_REF#refs/tags/} . docker run -u $UID:$GROUPS --mount type=bind,source="$(pwd)"/output,target=/out -v "$(pwd)"/Elastix-source/Testing/Data:/elastix/ superelastix/elastix:${GITHUB_REF#refs/tags/} elastix -out /out/ -p /elastix/parameters.3D.NC.euler.ASGD.001.txt -f /elastix/3DCT_lung_baseline.mha -m /elastix/3DCT_lung_followup.mha docker push superelastix/elastix:${GITHUB_REF#refs/tags/} - - diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 000000000..473ab67b2 --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,19 @@ +name: pre-commit + +on: + pull_request: + push: + branches: [master] + +jobs: + pre-commit: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + - name: Check install of Python, pre-commit + run: | + ./tools/pre-commit-setup.bash + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - uses: pre-commit/action@v3.0.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6034e51a7..565eeb839 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,6 @@ repos: - id: end-of-file-fixer exclude: "\\.(md5|sha|sha512|svg|vtk|vtp)$|^Resources\\/[^\\/]+\\.h$|\\/ColorFiles\\/.+\\.txt$|Data\\/Input\\/.+$|\\/ThirdParty\\/|\\/Data\\/" - id: forbid-new-submodules - - id: forbid-submodules - id: mixed-line-ending exclude: "\\.(sha|sha512|svg|vtk|vtp)$|\\/ThirdParty\\/|\\/Data\\/" - id: name-tests-test @@ -42,7 +41,7 @@ repos: - id: trailing-whitespace exclude: "\\.(sha|sha512|svg|vtk|vtp)$|\\/ThirdParty\\/|\\/Data\\/" - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v19.1.4 + rev: v19.1.7 hooks: - id: clang-format args: ['--style=file'] diff --git a/CMake/FindEigen3.cmake b/CMake/FindEigen3.cmake index 4ed91e92a..5013ee03d 100644 --- a/CMake/FindEigen3.cmake +++ b/CMake/FindEigen3.cmake @@ -78,4 +78,3 @@ else(EIGEN3_INCLUDE_DIR) mark_as_advanced(EIGEN3_INCLUDE_DIR) endif() - diff --git a/CMake/elastixVersion.cmake b/CMake/elastixVersion.cmake index 396ca9941..1a7b78ac7 100644 --- a/CMake/elastixVersion.cmake +++ b/CMake/elastixVersion.cmake @@ -3,4 +3,4 @@ set(ELASTIX_VERSION_MAJOR "5") set(ELASTIX_VERSION_MINOR "2") set(ELASTIX_VERSION_PATCH "0") -set(ELASTIX_VERSION "${ELASTIX_VERSION_MAJOR}.${ELASTIX_VERSION_MINOR}.${ELASTIX_VERSION_PATCH}") \ No newline at end of file +set(ELASTIX_VERSION "${ELASTIX_VERSION_MAJOR}.${ELASTIX_VERSION_MINOR}.${ELASTIX_VERSION_PATCH}") diff --git a/CMakeLists.txt b/CMakeLists.txt index 7808577f0..777be0a45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_policy(SET CMP0042 NEW) # "MACOSX_RPATH is enabled by default." include(CTest) #--------------------------------------------------------------------- -# Allow specifying whether or not the executables are built. +# Allow specifying whether or not the executables are built. option( ELASTIX_BUILD_EXECUTABLE "Build elastix and transformix as executable? (The libraries are always built as well anyway.)" ON ) # The following may make smaller and quicker loading libraries, diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1c46c910e..5748edb5b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -74,4 +74,3 @@ available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.ht For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq - diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt index 17f8e24d6..7c8022a8a 100644 --- a/Common/CMakeLists.txt +++ b/Common/CMakeLists.txt @@ -214,4 +214,3 @@ endif() target_link_libraries(elxCommon ${ITK_LIBRARIES} ) - diff --git a/Common/GTesting/itkImageFullSamplerGTest.cxx b/Common/GTesting/itkImageFullSamplerGTest.cxx index 30352e204..cbd845ff6 100644 --- a/Common/GTesting/itkImageFullSamplerGTest.cxx +++ b/Common/GTesting/itkImageFullSamplerGTest.cxx @@ -187,4 +187,4 @@ GTEST_TEST(ImageFullSampler, ExactlyEqualVersusSlightlyDifferentMaskImageDomain) EXPECT_FALSE(samplesOnExactlyEqualImageDomains.empty()); EXPECT_EQ(samplesOnExactlyEqualImageDomains, samplesOnSlightlyDifferentImageDomains); -} \ No newline at end of file +} diff --git a/Common/OpenCL/Kernels/GPUBSplineInterpolateImageFunction.cl b/Common/OpenCL/Kernels/GPUBSplineInterpolateImageFunction.cl index bed84368e..378ad0bb4 100644 --- a/Common/OpenCL/Kernels/GPUBSplineInterpolateImageFunction.cl +++ b/Common/OpenCL/Kernels/GPUBSplineInterpolateImageFunction.cl @@ -347,7 +347,7 @@ void set_interpolation_weights_3d( const float3 cindex, float * weights, // function pointers to reference the correct spline order. Left as is for // now for readability use following float per different spline order: // float w, w2, w4, t, t0, t1, t2; - + // create float x[3] from float3, makes it easy to use in loops float x[3]; x[0] = cindex.x; diff --git a/Components/CMakeLists.txt b/Components/CMakeLists.txt index 8d66d20f8..6bdd4eb82 100644 --- a/Components/CMakeLists.txt +++ b/Components/CMakeLists.txt @@ -234,4 +234,3 @@ foreach(userComponentDir ${ELASTIX_USER_COMPONENT_DIRS}) endforeach() endforeach() - diff --git a/Components/FixedImagePyramids/FixedGenericPyramid/CMakeLists.txt b/Components/FixedImagePyramids/FixedGenericPyramid/CMakeLists.txt index e6cdfe708..93f667e2a 100644 --- a/Components/FixedImagePyramids/FixedGenericPyramid/CMakeLists.txt +++ b/Components/FixedImagePyramids/FixedGenericPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( FixedGenericPyramid elxFixedGenericPyramid.h elxFixedGenericPyramid.hxx elxFixedGenericPyramid.cxx) - diff --git a/Components/FixedImagePyramids/FixedRecursivePyramid/CMakeLists.txt b/Components/FixedImagePyramids/FixedRecursivePyramid/CMakeLists.txt index 01edcafbe..84851cc6c 100644 --- a/Components/FixedImagePyramids/FixedRecursivePyramid/CMakeLists.txt +++ b/Components/FixedImagePyramids/FixedRecursivePyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( FixedRecursivePyramid elxFixedRecursivePyramid.h elxFixedRecursivePyramid.hxx elxFixedRecursivePyramid.cxx) - diff --git a/Components/FixedImagePyramids/FixedShrinkingPyramid/CMakeLists.txt b/Components/FixedImagePyramids/FixedShrinkingPyramid/CMakeLists.txt index 477c2238a..52fd5b01a 100644 --- a/Components/FixedImagePyramids/FixedShrinkingPyramid/CMakeLists.txt +++ b/Components/FixedImagePyramids/FixedShrinkingPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( FixedShrinkingPyramid # Was OFF by default before elastix 5.0. elxFixedShrinkingPyramid.h elxFixedShrinkingPyramid.hxx elxFixedShrinkingPyramid.cxx) - diff --git a/Components/FixedImagePyramids/FixedSmoothingPyramid/CMakeLists.txt b/Components/FixedImagePyramids/FixedSmoothingPyramid/CMakeLists.txt index bed2287c6..e433693c6 100644 --- a/Components/FixedImagePyramids/FixedSmoothingPyramid/CMakeLists.txt +++ b/Components/FixedImagePyramids/FixedSmoothingPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( FixedSmoothingPyramid elxFixedSmoothingPyramid.h elxFixedSmoothingPyramid.hxx elxFixedSmoothingPyramid.cxx) - diff --git a/Components/ImageSamplers/Full/CMakeLists.txt b/Components/ImageSamplers/Full/CMakeLists.txt index 645d69fc4..b24622637 100644 --- a/Components/ImageSamplers/Full/CMakeLists.txt +++ b/Components/ImageSamplers/Full/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( FullSampler elxFullSampler.h elxFullSampler.hxx elxFullSampler.cxx) - diff --git a/Components/ImageSamplers/Grid/CMakeLists.txt b/Components/ImageSamplers/Grid/CMakeLists.txt index 10610fcae..c97286569 100644 --- a/Components/ImageSamplers/Grid/CMakeLists.txt +++ b/Components/ImageSamplers/Grid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( GridSampler elxGridSampler.h elxGridSampler.hxx elxGridSampler.cxx) - diff --git a/Components/ImageSamplers/MultInputRandomCoordinate/CMakeLists.txt b/Components/ImageSamplers/MultInputRandomCoordinate/CMakeLists.txt index 340100f46..af4b72128 100644 --- a/Components/ImageSamplers/MultInputRandomCoordinate/CMakeLists.txt +++ b/Components/ImageSamplers/MultInputRandomCoordinate/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MultiInputRandomCoordinateSampler elxMultiInputRandomCoordinateSampler.h elxMultiInputRandomCoordinateSampler.hxx elxMultiInputRandomCoordinateSampler.cxx) - diff --git a/Components/ImageSamplers/Random/CMakeLists.txt b/Components/ImageSamplers/Random/CMakeLists.txt index 3f7567d6c..a4a3cdf46 100644 --- a/Components/ImageSamplers/Random/CMakeLists.txt +++ b/Components/ImageSamplers/Random/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RandomSampler elxRandomSampler.h elxRandomSampler.hxx elxRandomSampler.cxx) - diff --git a/Components/ImageSamplers/RandomCoordinate/CMakeLists.txt b/Components/ImageSamplers/RandomCoordinate/CMakeLists.txt index f1d4ae70f..669dbe883 100644 --- a/Components/ImageSamplers/RandomCoordinate/CMakeLists.txt +++ b/Components/ImageSamplers/RandomCoordinate/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RandomCoordinateSampler elxRandomCoordinateSampler.h elxRandomCoordinateSampler.hxx elxRandomCoordinateSampler.cxx) - diff --git a/Components/ImageSamplers/RandomSparseMask/CMakeLists.txt b/Components/ImageSamplers/RandomSparseMask/CMakeLists.txt index f025365d1..7557a68b8 100644 --- a/Components/ImageSamplers/RandomSparseMask/CMakeLists.txt +++ b/Components/ImageSamplers/RandomSparseMask/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RandomSamplerSparseMask elxRandomSamplerSparseMask.h elxRandomSamplerSparseMask.hxx elxRandomSamplerSparseMask.cxx) - diff --git a/Components/Interpolators/BSplineInterpolator/CMakeLists.txt b/Components/Interpolators/BSplineInterpolator/CMakeLists.txt index ce68015eb..609e97853 100644 --- a/Components/Interpolators/BSplineInterpolator/CMakeLists.txt +++ b/Components/Interpolators/BSplineInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( BSplineInterpolator elxBSplineInterpolator.h elxBSplineInterpolator.hxx elxBSplineInterpolator.cxx) - diff --git a/Components/Interpolators/BSplineInterpolatorFloat/CMakeLists.txt b/Components/Interpolators/BSplineInterpolatorFloat/CMakeLists.txt index 199f51548..33dfee7fa 100644 --- a/Components/Interpolators/BSplineInterpolatorFloat/CMakeLists.txt +++ b/Components/Interpolators/BSplineInterpolatorFloat/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( BSplineInterpolatorFloat # Was OFF by default before elastix 5 elxBSplineInterpolatorFloat.h elxBSplineInterpolatorFloat.hxx elxBSplineInterpolatorFloat.cxx) - diff --git a/Components/Interpolators/LinearInterpolator/CMakeLists.txt b/Components/Interpolators/LinearInterpolator/CMakeLists.txt index b1bf30026..c3366ce7a 100644 --- a/Components/Interpolators/LinearInterpolator/CMakeLists.txt +++ b/Components/Interpolators/LinearInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( LinearInterpolator elxLinearInterpolator.h elxLinearInterpolator.hxx elxLinearInterpolator.cxx) - diff --git a/Components/Interpolators/NearestNeighborInterpolator/CMakeLists.txt b/Components/Interpolators/NearestNeighborInterpolator/CMakeLists.txt index 679fe648b..7807c820f 100644 --- a/Components/Interpolators/NearestNeighborInterpolator/CMakeLists.txt +++ b/Components/Interpolators/NearestNeighborInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( NearestNeighborInterpolator # Was OFF by default before elasti elxNearestNeighborInterpolator.h elxNearestNeighborInterpolator.hxx elxNearestNeighborInterpolator.cxx) - diff --git a/Components/Interpolators/RayCastInterpolator/CMakeLists.txt b/Components/Interpolators/RayCastInterpolator/CMakeLists.txt index f6fb40e0b..2675a4cec 100644 --- a/Components/Interpolators/RayCastInterpolator/CMakeLists.txt +++ b/Components/Interpolators/RayCastInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RayCastInterpolator # Was OFF by default before elastix 5.0.1 elxRayCastInterpolator.h elxRayCastInterpolator.hxx elxRayCastInterpolator.cxx) - diff --git a/Components/Interpolators/ReducedDimensionBSplineInterpolator/CMakeLists.txt b/Components/Interpolators/ReducedDimensionBSplineInterpolator/CMakeLists.txt index bf015f1f5..2d2f286ea 100644 --- a/Components/Interpolators/ReducedDimensionBSplineInterpolator/CMakeLists.txt +++ b/Components/Interpolators/ReducedDimensionBSplineInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( ReducedDimensionBSplineInterpolator elxReducedDimensionBSplineInterpolator.h elxReducedDimensionBSplineInterpolator.hxx elxReducedDimensionBSplineInterpolator.cxx) - diff --git a/Components/Metrics/AdvancedKappaStatistic/CMakeLists.txt b/Components/Metrics/AdvancedKappaStatistic/CMakeLists.txt index 933da21cd..ec5819f01 100644 --- a/Components/Metrics/AdvancedKappaStatistic/CMakeLists.txt +++ b/Components/Metrics/AdvancedKappaStatistic/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AdvancedKappaStatisticMetric # Was OFF by default before elast elxAdvancedKappaStatisticMetric.cxx itkAdvancedKappaStatisticImageToImageMetric.h itkAdvancedKappaStatisticImageToImageMetric.hxx) - diff --git a/Components/Metrics/AdvancedMattesMutualInformation/CMakeLists.txt b/Components/Metrics/AdvancedMattesMutualInformation/CMakeLists.txt index 509d2f940..7606bdbaa 100644 --- a/Components/Metrics/AdvancedMattesMutualInformation/CMakeLists.txt +++ b/Components/Metrics/AdvancedMattesMutualInformation/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AdvancedMattesMutualInformationMetric elxAdvancedMattesMutualInformationMetric.cxx itkParzenWindowMutualInformationImageToImageMetric.h itkParzenWindowMutualInformationImageToImageMetric.hxx) - diff --git a/Components/Metrics/AdvancedMeanSquares/CMakeLists.txt b/Components/Metrics/AdvancedMeanSquares/CMakeLists.txt index 4a5375883..27e91bd3f 100644 --- a/Components/Metrics/AdvancedMeanSquares/CMakeLists.txt +++ b/Components/Metrics/AdvancedMeanSquares/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AdvancedMeanSquaresMetric elxAdvancedMeanSquaresMetric.cxx itkAdvancedMeanSquaresImageToImageMetric.h itkAdvancedMeanSquaresImageToImageMetric.hxx) - diff --git a/Components/Metrics/AdvancedNormalizedCorrelation/CMakeLists.txt b/Components/Metrics/AdvancedNormalizedCorrelation/CMakeLists.txt index 4dc161d41..7c0ed1d8b 100644 --- a/Components/Metrics/AdvancedNormalizedCorrelation/CMakeLists.txt +++ b/Components/Metrics/AdvancedNormalizedCorrelation/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AdvancedNormalizedCorrelationMetric elxAdvancedNormalizedCorrelationMetric.cxx itkAdvancedNormalizedCorrelationImageToImageMetric.h itkAdvancedNormalizedCorrelationImageToImageMetric.hxx) - diff --git a/Components/Metrics/BendingEnergyPenalty/CMakeLists.txt b/Components/Metrics/BendingEnergyPenalty/CMakeLists.txt index 73ef336e4..6e7a27890 100644 --- a/Components/Metrics/BendingEnergyPenalty/CMakeLists.txt +++ b/Components/Metrics/BendingEnergyPenalty/CMakeLists.txt @@ -6,4 +6,3 @@ ADD_ELXCOMPONENT( TransformBendingEnergyPenalty itkTransformBendingEnergyPenaltyTerm.h itkTransformBendingEnergyPenaltyTerm.hxx ) - diff --git a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/CMakeLists.txt b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/CMakeLists.txt index 6ae25e714..f0d43f66d 100644 --- a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/CMakeLists.txt +++ b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( CorrespondingPointsEuclideanDistanceMetric elxCorrespondingPointsEuclideanDistanceMetric.hxx itkCorrespondingPointsEuclideanDistancePointMetric.h itkCorrespondingPointsEuclideanDistancePointMetric.hxx) - diff --git a/Components/Metrics/DisplacementMagnitudePenalty/CMakeLists.txt b/Components/Metrics/DisplacementMagnitudePenalty/CMakeLists.txt index 5b7f955e0..1a5bfad5d 100644 --- a/Components/Metrics/DisplacementMagnitudePenalty/CMakeLists.txt +++ b/Components/Metrics/DisplacementMagnitudePenalty/CMakeLists.txt @@ -6,4 +6,3 @@ ADD_ELXCOMPONENT( DisplacementMagnitudePenalty # Was OFF by default before elast itkDisplacementMagnitudePenaltyTerm.h itkDisplacementMagnitudePenaltyTerm.hxx ) - diff --git a/Components/Metrics/DistancePreservingRigidityPenalty/CMakeLists.txt b/Components/Metrics/DistancePreservingRigidityPenalty/CMakeLists.txt index 882673d77..e677cb7b8 100644 --- a/Components/Metrics/DistancePreservingRigidityPenalty/CMakeLists.txt +++ b/Components/Metrics/DistancePreservingRigidityPenalty/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( DistancePreservingRigidityPenalty elxDistancePreservingRigidityPenaltyTerm.cxx itkDistancePreservingRigidityPenaltyTerm.h itkDistancePreservingRigidityPenaltyTerm.hxx) - diff --git a/Components/Metrics/GradientDifference/CMakeLists.txt b/Components/Metrics/GradientDifference/CMakeLists.txt index 5be895020..34dbf2b75 100644 --- a/Components/Metrics/GradientDifference/CMakeLists.txt +++ b/Components/Metrics/GradientDifference/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( GradientDifferenceMetric # Was OFF by default before elastix 5 elxGradientDifferenceMetric.cxx itkGradientDifferenceImageToImageMetric2.h itkGradientDifferenceImageToImageMetric2.hxx) - diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/CMakeLists.txt b/Components/Metrics/KNNGraphAlphaMutualInformation/CMakeLists.txt index 39490c0f5..52f94a57d 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/CMakeLists.txt +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/CMakeLists.txt @@ -18,4 +18,3 @@ if(USE_KNNGraphAlphaMutualInformationMetric) elastix_export_target(KNNlib) elastix_export_target(ANNlib) endif() - diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/License.txt b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/License.txt index 456ea9781..db12a1d06 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/License.txt +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/License.txt @@ -208,7 +208,7 @@ collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work -under the scope of this License. +under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do @@ -310,7 +310,7 @@ user to the copy of this License. Also, you must do one of these things: from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. + materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the @@ -338,7 +338,7 @@ that you do these two things: Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. + where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt @@ -447,4 +447,4 @@ DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR -OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/include/ANN/ANN.h.in b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/include/ANN/ANN.h.in index 7719fccb8..d2197f22f 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/include/ANN/ANN.h.in +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/include/ANN/ANN.h.in @@ -7,12 +7,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2010 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -141,7 +141,7 @@ typedef double ANNdist; // distance data type // returned as an integer index into this array. To make it // clearer when this is happening, we define the integer type // ANNidx. Indexing starts from 0. -// +// // For fixed-radius near neighbor searching, it is possible that // there are not k nearest neighbors within the search radius. To // indicate this, the algorithm returns ANN_NULL_IDX as its result. @@ -270,10 +270,10 @@ const ANNbool ANN_ALLOW_SELF_MATCH = @ANN_ALLOW_SELF_MATCH@; // we assume that there is an incremental update function DIFF(x,y) // for #, such that if: // -// s = x0 # ... # xi # ... # xk +// s = x0 # ... # xi # ... # xk +// +// then if s' is equal to s but with xi replaced by y, that is, // -// then if s' is equal to s but with xi replaced by y, that is, -// // s' = x0 # ... # y # ... # xk // // then the length of s' can be computed by: @@ -296,7 +296,7 @@ const ANNbool ANN_ALLOW_SELF_MATCH = @ANN_ALLOW_SELF_MATCH@; // POW(v) = v^p POW(v) = |v|^p // ROOT(x) = x^(1/p) ROOT(x) = x^(1/p) // # = + # = + -// DIFF(x,y) = y - x DIFF(x,y) = y - x +// DIFF(x,y) = y - x DIFF(x,y) = y - x // // L_inf: // POW(v) = |v| @@ -351,8 +351,8 @@ const ANNbool ANN_ALLOW_SELF_MATCH = @ANN_ALLOW_SELF_MATCH@; //---------------------------------------------------------------------- typedef ANNcoord* ANNpoint; // a point -typedef ANNpoint* ANNpointArray; // an array of points -typedef ANNdist* ANNdistArray; // an array of distances +typedef ANNpoint* ANNpointArray; // an array of points +typedef ANNdist* ANNdistArray; // an array of distances typedef ANNidx* ANNidxArray; // an array of point indices //---------------------------------------------------------------------- @@ -391,7 +391,7 @@ typedef ANNidx* ANNidxArray; // an array of point indices // the new point. It returns a pointer to the newly // allocated copy. //---------------------------------------------------------------------- - + ANNLIB_EXPORT ANNdist annDist( int dim, // dimension of space ANNpoint p, // points @@ -407,7 +407,7 @@ ANNLIB_EXPORT ANNpointArray annAllocPts( ANNLIB_EXPORT void annDeallocPt( ANNpoint &p); // deallocate 1 point - + ANNLIB_EXPORT void annDeallocPts( ANNpointArray &pa); // point array @@ -626,7 +626,7 @@ const int ANN_N_SHRINK_RULES = 4; // number of shrink rules // format that is suitable reading by another program. There is a // "load" constructor, which constructs a tree which is assumed to // have been saved by the Dump() procedure. -// +// // Performance and Structure Statistics: // ------------------------------------- // The procedure getStats() collects statistics information on the @@ -755,10 +755,10 @@ public: virtual void Dump( // dump entire tree ANNbool with_pts, // print points as well? std::ostream& out); // output stream - + virtual void getStats( // compute tree statistics ANNkdStats& st); // the statistics (modified) -}; +}; //---------------------------------------------------------------------- // Box decomposition tree (bd-tree) diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/ANN.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/ANN.cpp index 382c9db59..0c25c6ff4 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/ANN.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/ANN.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2010 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -28,7 +28,7 @@ #include // C standard lib defs #include // all ANN includes -#include // ANN performance +#include // ANN performance using namespace std; // make std:: accessible @@ -113,7 +113,7 @@ ANNpoint annAllocPt(int dim, ANNcoord c) // allocate 1 point for (int i = 0; i < dim; i++) p[i] = c; return p; } - + ANNpointArray annAllocPts(int n, int dim) // allocate n pts in dim { auto pa = new ANNpoint[n]; // allocate points @@ -129,21 +129,21 @@ void annDeallocPt(ANNpoint &p) // deallocate 1 point delete [] p; p = NULL; } - + void annDeallocPts(ANNpointArray &pa) // deallocate points { delete [] pa[0]; // dealloc coordinate storage delete [] pa; // dealloc points pa = NULL; } - + ANNpoint annCopyPt(int dim, ANNpoint source) // copy point { auto p = new ANNcoord[dim]; for (int i = 0; i < dim; i++) p[i] = source[i]; return p; } - + // assign one rect to another void annAssignRect(int dim, ANNorthRect &dest, const ANNorthRect &source) { diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_fix_rad_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_fix_rad_search.cpp index dea3f6bdf..1cba30d7f 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_fix_rad_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_fix_rad_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_pr_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_pr_search.cpp index d16d63294..e14643add 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_pr_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_pr_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_search.cpp index f057018a2..683e86e39 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_tree.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_tree.cpp index 0977dea96..9be555a38 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_tree.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/bd_tree.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -33,7 +33,7 @@ #include // performance evaluation //---------------------------------------------------------------------- -// Printing a bd-tree +// Printing a bd-tree // These routines print a bd-tree. See the analogous procedure // in kd_tree.cpp for more information. //---------------------------------------------------------------------- @@ -350,16 +350,16 @@ ANNkd_ptr rbd_tree( // recursive construction of bd-tree if (n == 0) // empty leaf node return KD_TRIVIAL; // return (canonical) empty leaf else // construct the node and return - return new ANNkd_leaf(n, pidx); + return new ANNkd_leaf(n, pidx); } - + decomp = selectDecomp( // select decomposition method pa, pidx, // points and indices n, dim, // number of points and dimension bnd_box, // current bounding box splitter, shrink, // splitting/shrinking methods inner_box); // inner box if shrinking (returned) - + if (decomp == SPLIT) { // split selected int cd; // cutting dimension ANNcoord cv; // cutting value @@ -414,4 +414,4 @@ ANNkd_ptr rbd_tree( // recursive construction of bd-tree // return shrinking node return new ANNbd_shrink(n_bnds, bnds, in, out); } -} +} diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/brute.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/brute.cpp index 1ac1f444c..6ec5abb05 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/brute.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/brute.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_dump.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_dump.cpp index 82a7bf7fe..fbe92ae67 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_dump.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_dump.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -85,7 +85,7 @@ static ANNkd_ptr annReadTree( // read tree-part of dump file // ... (upper end of bounding box) // If the tree is null, then a single line "null" is // output. Otherwise the nodes of the tree are printed -// one per line in preorder. Leaves and splitting nodes +// one per line in preorder. Leaves and splitting nodes // have the following formats: // Leaf node: // leaf ... diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_fix_rad_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_fix_rad_search.cpp index 3c40bde51..edbb1f347 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_fix_rad_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_fix_rad_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_pr_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_pr_search.cpp index 8b9a6df1b..166a6b225 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_pr_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_pr_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_search.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_search.cpp index 31a7cd716..adb9bee6c 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_search.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_search.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_split.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_split.cpp index 152a07aea..a1cfa65fa 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_split.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_split.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_tree.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_tree.cpp index 348e35e50..db4cb4bd0 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_tree.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_tree.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -50,7 +50,7 @@ static int IDX_TRIVIAL[] = {0}; // trivial point index ANNkd_leaf *KD_TRIVIAL = NULL; // trivial leaf node //---------------------------------------------------------------------- -// Printing the kd-tree +// Printing the kd-tree // These routines print a kd-tree in reverse inorder (high then // root then low). (This is so that if you look at the output // from the right side it appear from left to right in standard @@ -130,7 +130,7 @@ void ANNkd_tree::Print( // print entire tree #define MAX(a,b) ((a) > (b) ? (a) : (b)) -void ANNkdStats::merge(const ANNkdStats &st) // merge stats from child +void ANNkdStats::merge(const ANNkdStats &st) // merge stats from child { n_lf += st.n_lf; n_tl += st.n_tl; n_spl += st.n_spl; n_shr += st.n_shr; @@ -295,7 +295,7 @@ ANNkd_tree::ANNkd_tree( // basic constructor // // One of the arguments is a pointer to a splitting routine, // whose prototype is: -// +// // void split( // ANNpointArray pa, // complete point array // ANNidxArray pidx, // point array (permuted on return) @@ -324,7 +324,7 @@ ANNkd_ptr rkd_tree( // recursive construction of kd-tree if (n == 0) // empty leaf node return KD_TRIVIAL; // return (canonical) empty leaf else // construct the node and return - return new ANNkd_leaf(n, pidx); + return new ANNkd_leaf(n, pidx); } else { // n large, make a splitting node int cd; // cutting dimension @@ -355,7 +355,7 @@ ANNkd_ptr rkd_tree( // recursive construction of kd-tree return ptr; // return pointer to this node } -} +} //---------------------------------------------------------------------- // kd-tree constructor diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_util.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_util.cpp index 37f25d7fe..9fc95e4a3 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_util.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/kd_util.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2005 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied @@ -279,7 +279,7 @@ void annMedianSplit( // Split the points in an array about a given plane along a // given cutting dimension. On exit, br1 and br2 are set so // that: -// +// // pa[ 0 ..br1-1] < cv // pa[br1..br2-1] == cv // pa[br2.. n -1] > cv diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/perf.cpp b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/perf.cpp index ce2f76396..3a3ff7e2a 100644 --- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/perf.cpp +++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/src/perf.cpp @@ -6,12 +6,12 @@ //---------------------------------------------------------------------- // Copyright (c) 1997-2010 University of Maryland and Sunil Arya and // David Mount. All Rights Reserved. -// +// // This software and related documentation is part of the Approximate // Nearest Neighbor Library (ANN). This software is provided under // the provisions of the Lesser GNU Public License (LGPL). See the // file ../ReadMe.txt for further information. -// +// // The University of Maryland (U.M.) and the authors make no // representations about the suitability or fitness of this software for // any purpose. It is provided "as is" without express or implied diff --git a/Components/Metrics/MissingStructurePenalty/CMakeLists.txt b/Components/Metrics/MissingStructurePenalty/CMakeLists.txt index 69cfc1fae..41d8a9e7b 100644 --- a/Components/Metrics/MissingStructurePenalty/CMakeLists.txt +++ b/Components/Metrics/MissingStructurePenalty/CMakeLists.txt @@ -3,6 +3,5 @@ ADD_ELXCOMPONENT( MissingStructurePenalty # Was OFF by default before elastix 5. elxMissingStructurePenalty.h elxMissingStructurePenalty.hxx itkMissingStructurePenalty.h - itkMissingStructurePenalty.hxx + itkMissingStructurePenalty.hxx vnl_adjugate_fixed.h) - diff --git a/Components/Metrics/NormalizedGradientCorrelation/CMakeLists.txt b/Components/Metrics/NormalizedGradientCorrelation/CMakeLists.txt index 6b8e0f10d..c6920191e 100644 --- a/Components/Metrics/NormalizedGradientCorrelation/CMakeLists.txt +++ b/Components/Metrics/NormalizedGradientCorrelation/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( NormalizedGradientCorrelationMetric # Was OFF by default befor elxNormalizedGradientCorrelationMetric.cxx itkNormalizedGradientCorrelationImageToImageMetric.h itkNormalizedGradientCorrelationImageToImageMetric.hxx) - diff --git a/Components/Metrics/NormalizedMutualInformation/CMakeLists.txt b/Components/Metrics/NormalizedMutualInformation/CMakeLists.txt index cb37ab896..3ebaeeb51 100644 --- a/Components/Metrics/NormalizedMutualInformation/CMakeLists.txt +++ b/Components/Metrics/NormalizedMutualInformation/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( NormalizedMutualInformationMetric elxNormalizedMutualInformationMetric.cxx itkParzenWindowNormalizedMutualInformationImageToImageMetric.h itkParzenWindowNormalizedMutualInformationImageToImageMetric.hxx) - diff --git a/Components/Metrics/PCAMetric/CMakeLists.txt b/Components/Metrics/PCAMetric/CMakeLists.txt index a70a915d7..807cb1303 100644 --- a/Components/Metrics/PCAMetric/CMakeLists.txt +++ b/Components/Metrics/PCAMetric/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_ELXCOMPONENT( PCAMetric ON elxPCAMetric.cxx itkPCAMetric.h itkPCAMetric.hxx) - diff --git a/Components/Metrics/PCAMetric2/CMakeLists.txt b/Components/Metrics/PCAMetric2/CMakeLists.txt index b70c15089..05cba99f3 100644 --- a/Components/Metrics/PCAMetric2/CMakeLists.txt +++ b/Components/Metrics/PCAMetric2/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_ELXCOMPONENT( PCAMetric2 ON elxPCAMetric2.cxx itkPCAMetric2.h itkPCAMetric2.hxx) - diff --git a/Components/Metrics/PatternIntensity/CMakeLists.txt b/Components/Metrics/PatternIntensity/CMakeLists.txt index d5a38e9fb..4ead38808 100644 --- a/Components/Metrics/PatternIntensity/CMakeLists.txt +++ b/Components/Metrics/PatternIntensity/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( PatternIntensityMetric # Was OFF by default before elastix 5.0 elxPatternIntensityMetric.cxx itkPatternIntensityImageToImageMetric.h itkPatternIntensityImageToImageMetric.hxx) - diff --git a/Components/Metrics/PolydataDummyPenalty/CMakeLists.txt b/Components/Metrics/PolydataDummyPenalty/CMakeLists.txt index 2ab8a4cf1..ddbaadb0f 100644 --- a/Components/Metrics/PolydataDummyPenalty/CMakeLists.txt +++ b/Components/Metrics/PolydataDummyPenalty/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( PolydataDummyPenalty # Was OFF by default before elastix 5.0.1 itkPolydataDummyPenalty.h itkPolydataDummyPenalty.hxx ) - diff --git a/Components/Metrics/RigidityPenalty/CMakeLists.txt b/Components/Metrics/RigidityPenalty/CMakeLists.txt index 275aabe8e..f25537e6a 100644 --- a/Components/Metrics/RigidityPenalty/CMakeLists.txt +++ b/Components/Metrics/RigidityPenalty/CMakeLists.txt @@ -6,4 +6,3 @@ ADD_ELXCOMPONENT( TransformRigidityPenalty itkTransformRigidityPenaltyTerm.h itkTransformRigidityPenaltyTerm.hxx ) - diff --git a/Components/Metrics/StatisticalShapePenalty/CMakeLists.txt b/Components/Metrics/StatisticalShapePenalty/CMakeLists.txt index 8a92cf4d1..5ae3d1d7b 100644 --- a/Components/Metrics/StatisticalShapePenalty/CMakeLists.txt +++ b/Components/Metrics/StatisticalShapePenalty/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( StatisticalShapePenalty # Was OFF by default before elastix 5. elxStatisticalShapePenalty.hxx itkStatisticalShapePointPenalty.h itkStatisticalShapePointPenalty.hxx) - diff --git a/Components/Metrics/SumOfPairwiseCorrelationsMetric/CMakeLists.txt b/Components/Metrics/SumOfPairwiseCorrelationsMetric/CMakeLists.txt index ce82a00df..e9776ff24 100644 --- a/Components/Metrics/SumOfPairwiseCorrelationsMetric/CMakeLists.txt +++ b/Components/Metrics/SumOfPairwiseCorrelationsMetric/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( SumOfPairwiseCorrelationCoefficientsMetric itkSumOfPairwiseCorrelationCoefficientsMetric.h itkSumOfPairwiseCorrelationCoefficientsMetric.hxx ) - diff --git a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/CMakeLists.txt b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/CMakeLists.txt index a3e16fc96..a6f204a12 100644 --- a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/CMakeLists.txt +++ b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( SumSquaredTissueVolumeDifferenceMetric elxSumSquaredTissueVolumeDifferenceMetric.cxx itkSumSquaredTissueVolumeDifferenceImageToImageMetric.h itkSumSquaredTissueVolumeDifferenceImageToImageMetric.hxx) - diff --git a/Components/Metrics/VarianceOverLastDimension/CMakeLists.txt b/Components/Metrics/VarianceOverLastDimension/CMakeLists.txt index 877a71207..4a1331bf5 100644 --- a/Components/Metrics/VarianceOverLastDimension/CMakeLists.txt +++ b/Components/Metrics/VarianceOverLastDimension/CMakeLists.txt @@ -6,4 +6,3 @@ ADD_ELXCOMPONENT( VarianceOverLastDimensionMetric itkVarianceOverLastDimensionImageMetric.h itkVarianceOverLastDimensionImageMetric.hxx ) - diff --git a/Components/MovingImagePyramids/MovingGenericPyramid/CMakeLists.txt b/Components/MovingImagePyramids/MovingGenericPyramid/CMakeLists.txt index c65da7e49..2832b9af4 100644 --- a/Components/MovingImagePyramids/MovingGenericPyramid/CMakeLists.txt +++ b/Components/MovingImagePyramids/MovingGenericPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MovingGenericPyramid elxMovingGenericPyramid.h elxMovingGenericPyramid.hxx elxMovingGenericPyramid.cxx) - diff --git a/Components/MovingImagePyramids/MovingRecursivePyramid/CMakeLists.txt b/Components/MovingImagePyramids/MovingRecursivePyramid/CMakeLists.txt index 9d09959ff..54abcbeed 100644 --- a/Components/MovingImagePyramids/MovingRecursivePyramid/CMakeLists.txt +++ b/Components/MovingImagePyramids/MovingRecursivePyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MovingRecursivePyramid elxMovingRecursivePyramid.h elxMovingRecursivePyramid.hxx elxMovingRecursivePyramid.cxx) - diff --git a/Components/MovingImagePyramids/MovingShrinkingPyramid/CMakeLists.txt b/Components/MovingImagePyramids/MovingShrinkingPyramid/CMakeLists.txt index e33672db9..7dd01d380 100644 --- a/Components/MovingImagePyramids/MovingShrinkingPyramid/CMakeLists.txt +++ b/Components/MovingImagePyramids/MovingShrinkingPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MovingShrinkingPyramid # Was OFF by default before elastix 5.0 elxMovingShrinkingPyramid.h elxMovingShrinkingPyramid.hxx elxMovingShrinkingPyramid.cxx) - diff --git a/Components/MovingImagePyramids/MovingSmoothingPyramid/CMakeLists.txt b/Components/MovingImagePyramids/MovingSmoothingPyramid/CMakeLists.txt index 955cfa35f..829f92fc5 100644 --- a/Components/MovingImagePyramids/MovingSmoothingPyramid/CMakeLists.txt +++ b/Components/MovingImagePyramids/MovingSmoothingPyramid/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MovingSmoothingPyramid elxMovingSmoothingPyramid.h elxMovingSmoothingPyramid.hxx elxMovingSmoothingPyramid.cxx) - diff --git a/Components/Optimizers/AdaGrad/CMakeLists.txt b/Components/Optimizers/AdaGrad/CMakeLists.txt index 78bb4d1ea..48cdbb467 100644 --- a/Components/Optimizers/AdaGrad/CMakeLists.txt +++ b/Components/Optimizers/AdaGrad/CMakeLists.txt @@ -8,4 +8,3 @@ ADD_ELXCOMPONENT( AdaGrad OFF # OFF by default after elastix 5.0.1 ../StandardGradientDescent/itkStandardGradientDescentOptimizer.cxx ../StandardGradientDescent/itkGradientDescentOptimizer2.cxx ) - diff --git a/Components/Optimizers/AdaptiveStochasticGradientDescent/CMakeLists.txt b/Components/Optimizers/AdaptiveStochasticGradientDescent/CMakeLists.txt index b642d3b3f..5b692dbe8 100644 --- a/Components/Optimizers/AdaptiveStochasticGradientDescent/CMakeLists.txt +++ b/Components/Optimizers/AdaptiveStochasticGradientDescent/CMakeLists.txt @@ -8,4 +8,3 @@ ADD_ELXCOMPONENT( AdaptiveStochasticGradientDescent ../StandardGradientDescent/itkStandardGradientDescentOptimizer.cxx ../StandardGradientDescent/itkGradientDescentOptimizer2.cxx ) - diff --git a/Components/Optimizers/AdaptiveStochasticLBFGS/CMakeLists.txt b/Components/Optimizers/AdaptiveStochasticLBFGS/CMakeLists.txt index 5911b9b62..d04bda693 100644 --- a/Components/Optimizers/AdaptiveStochasticLBFGS/CMakeLists.txt +++ b/Components/Optimizers/AdaptiveStochasticLBFGS/CMakeLists.txt @@ -10,4 +10,3 @@ ADD_ELXCOMPONENT( AdaptiveStochasticLBFGS OFF # OFF by default after elastix 5.0 ../StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.h ../StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.cxx ) - diff --git a/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/CMakeLists.txt b/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/CMakeLists.txt index a6c48a989..c9fc0076d 100644 --- a/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/CMakeLists.txt +++ b/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/CMakeLists.txt @@ -8,4 +8,3 @@ ADD_ELXCOMPONENT( AdaptiveStochasticVarianceReducedGradient OFF # OFF by default itkStandardStochasticVarianceReducedGradientDescentOptimizer.cxx itkStochasticVarianceReducedGradientDescentOptimizer.cxx ) - diff --git a/Components/Optimizers/CMAEvolutionStrategy/CMakeLists.txt b/Components/Optimizers/CMAEvolutionStrategy/CMakeLists.txt index 5ed7f8628..8573c3aeb 100644 --- a/Components/Optimizers/CMAEvolutionStrategy/CMakeLists.txt +++ b/Components/Optimizers/CMAEvolutionStrategy/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( CMAEvolutionStrategy # Was OFF by default before elastix 5.0.1 elxCMAEvolutionStrategy.cxx itkCMAEvolutionStrategyOptimizer.h itkCMAEvolutionStrategyOptimizer.cxx) - diff --git a/Components/Optimizers/ConjugateGradient/CMakeLists.txt b/Components/Optimizers/ConjugateGradient/CMakeLists.txt index 239982334..f02371d86 100644 --- a/Components/Optimizers/ConjugateGradient/CMakeLists.txt +++ b/Components/Optimizers/ConjugateGradient/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( ConjugateGradient elxConjugateGradient.cxx itkGenericConjugateGradientOptimizer.h itkGenericConjugateGradientOptimizer.cxx) - diff --git a/Components/Optimizers/ConjugateGradientFRPR/CMakeLists.txt b/Components/Optimizers/ConjugateGradientFRPR/CMakeLists.txt index f28818048..f48c41d9a 100644 --- a/Components/Optimizers/ConjugateGradientFRPR/CMakeLists.txt +++ b/Components/Optimizers/ConjugateGradientFRPR/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( ConjugateGradientFRPR # Was OFF by default before elastix 5.0. elxConjugateGradientFRPR.h elxConjugateGradientFRPR.hxx elxConjugateGradientFRPR.cxx) - diff --git a/Components/Optimizers/FiniteDifferenceGradientDescent/CMakeLists.txt b/Components/Optimizers/FiniteDifferenceGradientDescent/CMakeLists.txt index a2e47dd42..a8b6357b9 100644 --- a/Components/Optimizers/FiniteDifferenceGradientDescent/CMakeLists.txt +++ b/Components/Optimizers/FiniteDifferenceGradientDescent/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( FiniteDifferenceGradientDescent elxFiniteDifferenceGradientDescent.cxx itkFiniteDifferenceGradientDescentOptimizer.cxx itkFiniteDifferenceGradientDescentOptimizer.h) - diff --git a/Components/Optimizers/FullSearch/CMakeLists.txt b/Components/Optimizers/FullSearch/CMakeLists.txt index a61b2a81f..49db99911 100644 --- a/Components/Optimizers/FullSearch/CMakeLists.txt +++ b/Components/Optimizers/FullSearch/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( FullSearch elxFullSearchOptimizer.cxx itkFullSearchOptimizer.h itkFullSearchOptimizer.cxx) - diff --git a/Components/Optimizers/Powell/CMakeLists.txt b/Components/Optimizers/Powell/CMakeLists.txt index 51dd1dd71..df3723127 100644 --- a/Components/Optimizers/Powell/CMakeLists.txt +++ b/Components/Optimizers/Powell/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( Powell elxPowell.h elxPowell.hxx elxPowell.cxx) - diff --git a/Components/Optimizers/PreconditionedStochasticGradientDescent/CMakeLists.txt b/Components/Optimizers/PreconditionedStochasticGradientDescent/CMakeLists.txt index b05a75f9c..58b9caebd 100644 --- a/Components/Optimizers/PreconditionedStochasticGradientDescent/CMakeLists.txt +++ b/Components/Optimizers/PreconditionedStochasticGradientDescent/CMakeLists.txt @@ -8,4 +8,3 @@ ADD_ELXCOMPONENT( PreconditionedStochasticGradientDescent ../StandardGradientDescent/itkStandardGradientDescentOptimizer.cxx ../StandardGradientDescent/itkGradientDescentOptimizer2.cxx ) - diff --git a/Components/Optimizers/QuasiNewtonLBFGS/CMakeLists.txt b/Components/Optimizers/QuasiNewtonLBFGS/CMakeLists.txt index b28850f06..d47001c12 100644 --- a/Components/Optimizers/QuasiNewtonLBFGS/CMakeLists.txt +++ b/Components/Optimizers/QuasiNewtonLBFGS/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( QuasiNewtonLBFGS elxQuasiNewtonLBFGS.cxx itkQuasiNewtonLBFGSOptimizer.h itkQuasiNewtonLBFGSOptimizer.cxx) - diff --git a/Components/Optimizers/RSGDEachParameterApart/CMakeLists.txt b/Components/Optimizers/RSGDEachParameterApart/CMakeLists.txt index d6394758e..ddb159183 100644 --- a/Components/Optimizers/RSGDEachParameterApart/CMakeLists.txt +++ b/Components/Optimizers/RSGDEachParameterApart/CMakeLists.txt @@ -7,4 +7,3 @@ ADD_ELXCOMPONENT( RSGDEachParameterApart # Was OFF by default before elastix 5.0 itkRSGDEachParameterApartOptimizer.cxx itkRSGDEachParameterApartBaseOptimizer.h itkRSGDEachParameterApartBaseOptimizer.cxx) - diff --git a/Components/Optimizers/RegularStepGradientDescent/CMakeLists.txt b/Components/Optimizers/RegularStepGradientDescent/CMakeLists.txt index 01a34397f..bdde0ac7e 100644 --- a/Components/Optimizers/RegularStepGradientDescent/CMakeLists.txt +++ b/Components/Optimizers/RegularStepGradientDescent/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RegularStepGradientDescent elxRegularStepGradientDescent.h elxRegularStepGradientDescent.hxx elxRegularStepGradientDescent.cxx) - diff --git a/Components/Optimizers/Simplex/CMakeLists.txt b/Components/Optimizers/Simplex/CMakeLists.txt index 6a4e7ef87..234e2d515 100644 --- a/Components/Optimizers/Simplex/CMakeLists.txt +++ b/Components/Optimizers/Simplex/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( Simplex # Was OFF by default before elastix 5.0.1 elxSimplex.h elxSimplex.hxx elxSimplex.cxx) - diff --git a/Components/Optimizers/SimultaneousPerturbation/CMakeLists.txt b/Components/Optimizers/SimultaneousPerturbation/CMakeLists.txt index e8013b3bc..30b97b9f0 100644 --- a/Components/Optimizers/SimultaneousPerturbation/CMakeLists.txt +++ b/Components/Optimizers/SimultaneousPerturbation/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( SimultaneousPerturbation # Was OFF by default before elastix 5 elxSimultaneousPerturbation.h elxSimultaneousPerturbation.hxx elxSimultaneousPerturbation.cxx) - diff --git a/Components/Optimizers/StandardGradientDescent/CMakeLists.txt b/Components/Optimizers/StandardGradientDescent/CMakeLists.txt index e6339a3f1..3525708ad 100644 --- a/Components/Optimizers/StandardGradientDescent/CMakeLists.txt +++ b/Components/Optimizers/StandardGradientDescent/CMakeLists.txt @@ -7,4 +7,3 @@ ADD_ELXCOMPONENT( StandardGradientDescent itkStandardGradientDescentOptimizer.cxx itkGradientDescentOptimizer2.h itkGradientDescentOptimizer2.cxx) - diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/CMakeLists.txt b/Components/Registrations/MultiMetricMultiResolutionRegistration/CMakeLists.txt index 6fd195593..036d8aa0c 100644 --- a/Components/Registrations/MultiMetricMultiResolutionRegistration/CMakeLists.txt +++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/CMakeLists.txt @@ -7,4 +7,3 @@ ADD_ELXCOMPONENT( MultiMetricMultiResolutionRegistration itkMultiMetricMultiResolutionImageRegistrationMethod.hxx itkCombinationImageToImageMetric.h itkCombinationImageToImageMetric.hxx) - diff --git a/Components/Registrations/MultiResolutionRegistration/CMakeLists.txt b/Components/Registrations/MultiResolutionRegistration/CMakeLists.txt index ebe9d7cc0..27b8a33ec 100644 --- a/Components/Registrations/MultiResolutionRegistration/CMakeLists.txt +++ b/Components/Registrations/MultiResolutionRegistration/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( MultiResolutionRegistration elxMultiResolutionRegistration.h elxMultiResolutionRegistration.hxx elxMultiResolutionRegistration.cxx) - diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/CMakeLists.txt b/Components/Registrations/MultiResolutionRegistrationWithFeatures/CMakeLists.txt index 63f76925f..c1b4c675b 100644 --- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/CMakeLists.txt +++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/CMakeLists.txt @@ -7,4 +7,3 @@ ADD_ELXCOMPONENT( MultiResolutionRegistrationWithFeatures itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx itkMultiResolutionImageRegistrationMethodWithFeatures.h itkMultiResolutionImageRegistrationMethodWithFeatures.hxx) - diff --git a/Components/ResampleInterpolators/BSplineResampleInterpolator/CMakeLists.txt b/Components/ResampleInterpolators/BSplineResampleInterpolator/CMakeLists.txt index ebda40c32..3273b30d4 100644 --- a/Components/ResampleInterpolators/BSplineResampleInterpolator/CMakeLists.txt +++ b/Components/ResampleInterpolators/BSplineResampleInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( BSplineResampleInterpolator elxBSplineResampleInterpolator.h elxBSplineResampleInterpolator.hxx elxBSplineResampleInterpolator.cxx) - diff --git a/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/CMakeLists.txt b/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/CMakeLists.txt index 3bc008836..e8ca69d86 100644 --- a/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/CMakeLists.txt +++ b/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( BSplineResampleInterpolatorFloat # Was OFF by default before e elxBSplineResampleInterpolatorFloat.h elxBSplineResampleInterpolatorFloat.hxx elxBSplineResampleInterpolatorFloat.cxx) - diff --git a/Components/ResampleInterpolators/LinearResampleInterpolator/CMakeLists.txt b/Components/ResampleInterpolators/LinearResampleInterpolator/CMakeLists.txt index bfff1846e..a3e524834 100644 --- a/Components/ResampleInterpolators/LinearResampleInterpolator/CMakeLists.txt +++ b/Components/ResampleInterpolators/LinearResampleInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( LinearResampleInterpolator # Was OFF by default before elastix elxLinearResampleInterpolator.h elxLinearResampleInterpolator.hxx elxLinearResampleInterpolator.cxx) - diff --git a/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/CMakeLists.txt b/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/CMakeLists.txt index dd51c6b98..11ea08239 100644 --- a/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/CMakeLists.txt +++ b/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( NearestNeighborResampleInterpolator # Was OFF by default befor elxNearestNeighborResampleInterpolator.h elxNearestNeighborResampleInterpolator.hxx elxNearestNeighborResampleInterpolator.cxx) - diff --git a/Components/ResampleInterpolators/RDBSplineResampleInterpolator/CMakeLists.txt b/Components/ResampleInterpolators/RDBSplineResampleInterpolator/CMakeLists.txt index 3365b347c..ee89dd799 100644 --- a/Components/ResampleInterpolators/RDBSplineResampleInterpolator/CMakeLists.txt +++ b/Components/ResampleInterpolators/RDBSplineResampleInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( ReducedDimensionBSplineResampleInterpolator elxRDBSplineResampleInterpolator.h elxRDBSplineResampleInterpolator.hxx elxRDBSplineResampleInterpolator.cxx) - diff --git a/Components/ResampleInterpolators/RayCastResampleInterpolator/CMakeLists.txt b/Components/ResampleInterpolators/RayCastResampleInterpolator/CMakeLists.txt index a1810b50c..913126dfb 100644 --- a/Components/ResampleInterpolators/RayCastResampleInterpolator/CMakeLists.txt +++ b/Components/ResampleInterpolators/RayCastResampleInterpolator/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( RayCastResampleInterpolator # Was OFF by default before elasti elxRayCastResampleInterpolator.h elxRayCastResampleInterpolator.hxx elxRayCastResampleInterpolator.cxx) - diff --git a/Components/Resamplers/DefaultResampler/CMakeLists.txt b/Components/Resamplers/DefaultResampler/CMakeLists.txt index 33ccf8d52..a9841c2af 100644 --- a/Components/Resamplers/DefaultResampler/CMakeLists.txt +++ b/Components/Resamplers/DefaultResampler/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( DefaultResampler elxDefaultResampler.h elxDefaultResampler.hxx elxDefaultResampler.cxx) - diff --git a/Components/Resamplers/OpenCLResampler/CMakeLists.txt b/Components/Resamplers/OpenCLResampler/CMakeLists.txt index 9aeb21b3b..751721986 100644 --- a/Components/Resamplers/OpenCLResampler/CMakeLists.txt +++ b/Components/Resamplers/OpenCLResampler/CMakeLists.txt @@ -26,4 +26,3 @@ else() # list defined in Components/CMakeLists.txt. REMOVE_ELXCOMPONENT( OpenCLResampler) endif() - diff --git a/Components/Transforms/AdvancedAffineTransform/CMakeLists.txt b/Components/Transforms/AdvancedAffineTransform/CMakeLists.txt index dfb5fe612..18b5debe6 100644 --- a/Components/Transforms/AdvancedAffineTransform/CMakeLists.txt +++ b/Components/Transforms/AdvancedAffineTransform/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AdvancedAffineTransformElastix elxAdvancedAffineTransform.cxx itkCenteredTransformInitializer2.h itkCenteredTransformInitializer2.hxx) - diff --git a/Components/Transforms/AdvancedBSplineTransform/CMakeLists.txt b/Components/Transforms/AdvancedBSplineTransform/CMakeLists.txt index 41ed8b689..0264075bf 100644 --- a/Components/Transforms/AdvancedBSplineTransform/CMakeLists.txt +++ b/Components/Transforms/AdvancedBSplineTransform/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( AdvancedBSplineTransform elxAdvancedBSplineTransform.h elxAdvancedBSplineTransform.hxx elxAdvancedBSplineTransform.cxx) - diff --git a/Components/Transforms/AffineDTITransform/CMakeLists.txt b/Components/Transforms/AffineDTITransform/CMakeLists.txt index 17d97fdeb..e6cbf6113 100644 --- a/Components/Transforms/AffineDTITransform/CMakeLists.txt +++ b/Components/Transforms/AffineDTITransform/CMakeLists.txt @@ -8,4 +8,3 @@ ADD_ELXCOMPONENT( AffineDTITransformElastix # Was OFF by default before elastix itkAffineDTI3DTransform.h itkAffineDTI3DTransform.hxx itkAffineDTITransform.h) - diff --git a/Components/Transforms/AffineLogStackTransform/CMakeLists.txt b/Components/Transforms/AffineLogStackTransform/CMakeLists.txt index 842312969..5b0e92baf 100644 --- a/Components/Transforms/AffineLogStackTransform/CMakeLists.txt +++ b/Components/Transforms/AffineLogStackTransform/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( AffineLogStackTransform elxAffineLogStackTransform.hxx elxAffineLogStackTransform.cxx itkAffineLogStackTransform.h) - diff --git a/Components/Transforms/AffineLogTransform/CMakeLists.txt b/Components/Transforms/AffineLogTransform/CMakeLists.txt index 4aa0630da..96acda8dc 100644 --- a/Components/Transforms/AffineLogTransform/CMakeLists.txt +++ b/Components/Transforms/AffineLogTransform/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( AffineLogTransformElastix # Was OFF by default before elastix elxAffineLogTransform.cxx itkAffineLogTransform.h itkAffineLogTransform.hxx) - diff --git a/Components/Transforms/BSplineDeformableTransformWithDiffusion/CMakeLists.txt b/Components/Transforms/BSplineDeformableTransformWithDiffusion/CMakeLists.txt index 4ca778d2b..c768a2abe 100644 --- a/Components/Transforms/BSplineDeformableTransformWithDiffusion/CMakeLists.txt +++ b/Components/Transforms/BSplineDeformableTransformWithDiffusion/CMakeLists.txt @@ -9,4 +9,3 @@ ADD_ELXCOMPONENT( BSplineTransformWithDiffusion OFF itkDeformationVectorFieldTransform.hxx itkVectorMeanDiffusionImageFilter.h itkVectorMeanDiffusionImageFilter.hxx) - diff --git a/Components/Transforms/BSplineStackTransform/CMakeLists.txt b/Components/Transforms/BSplineStackTransform/CMakeLists.txt index 4b342887e..33f160d96 100644 --- a/Components/Transforms/BSplineStackTransform/CMakeLists.txt +++ b/Components/Transforms/BSplineStackTransform/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_ELXCOMPONENT( BSplineStackTransform elxBSplineStackTransform.hxx elxBSplineStackTransform.cxx itkBSplineStackTransform.h) - diff --git a/Components/Transforms/DeformationFieldTransform/CMakeLists.txt b/Components/Transforms/DeformationFieldTransform/CMakeLists.txt index 170f29b04..fdcce1dd6 100644 --- a/Components/Transforms/DeformationFieldTransform/CMakeLists.txt +++ b/Components/Transforms/DeformationFieldTransform/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( DeformationFieldTransform elxDeformationFieldTransform.h elxDeformationFieldTransform.hxx elxDeformationFieldTransform.cxx) - diff --git a/Components/Transforms/EulerStackTransform/CMakeLists.txt b/Components/Transforms/EulerStackTransform/CMakeLists.txt index 44181e2d3..5bf1ac23f 100644 --- a/Components/Transforms/EulerStackTransform/CMakeLists.txt +++ b/Components/Transforms/EulerStackTransform/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( EulerStackTransform elxEulerStackTransform.hxx elxEulerStackTransform.cxx itkEulerStackTransform.h) - diff --git a/Components/Transforms/EulerTransform/CMakeLists.txt b/Components/Transforms/EulerTransform/CMakeLists.txt index d30d5bcee..4bcad62b8 100644 --- a/Components/Transforms/EulerTransform/CMakeLists.txt +++ b/Components/Transforms/EulerTransform/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( EulerTransformElastix elxEulerTransform.h elxEulerTransform.hxx elxEulerTransform.cxx) - diff --git a/Components/Transforms/ExternalTransform/CMakeLists.txt b/Components/Transforms/ExternalTransform/CMakeLists.txt index 333dfedb8..81d7e5b23 100644 --- a/Components/Transforms/ExternalTransform/CMakeLists.txt +++ b/Components/Transforms/ExternalTransform/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_ELXCOMPONENT( ExternalTransform elxExternalTransform.h elxExternalTransform.hxx elxExternalTransform.cxx) - diff --git a/Components/Transforms/ExternalTransform/elxExternalTransform.h b/Components/Transforms/ExternalTransform/elxExternalTransform.h index 36a1f34b6..809d62195 100644 --- a/Components/Transforms/ExternalTransform/elxExternalTransform.h +++ b/Components/Transforms/ExternalTransform/elxExternalTransform.h @@ -116,4 +116,4 @@ class ITK_TEMPLATE_EXPORT ExternalTransform # include "elxExternalTransform.hxx" #endif -#endif \ No newline at end of file +#endif diff --git a/Components/Transforms/MultiBSplineTransformWithNormal/CMakeLists.txt b/Components/Transforms/MultiBSplineTransformWithNormal/CMakeLists.txt index d6a0cd90e..888ad3e2b 100644 --- a/Components/Transforms/MultiBSplineTransformWithNormal/CMakeLists.txt +++ b/Components/Transforms/MultiBSplineTransformWithNormal/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( MultiBSplineTransformWithNormal # Was OFF by default before el elxMultiBSplineTransformWithNormal.cxx itkMultiBSplineDeformableTransformWithNormal.h itkMultiBSplineDeformableTransformWithNormal.hxx) - diff --git a/Components/Transforms/RecursiveBSplineTransform/CMakeLists.txt b/Components/Transforms/RecursiveBSplineTransform/CMakeLists.txt index 71890748e..17085f9bd 100644 --- a/Components/Transforms/RecursiveBSplineTransform/CMakeLists.txt +++ b/Components/Transforms/RecursiveBSplineTransform/CMakeLists.txt @@ -2,4 +2,3 @@ ADD_ELXCOMPONENT( RecursiveBSplineTransform elxRecursiveBSplineTransform.h elxRecursiveBSplineTransform.hxx elxRecursiveBSplineTransform.cxx) - diff --git a/Components/Transforms/SimilarityTransform/CMakeLists.txt b/Components/Transforms/SimilarityTransform/CMakeLists.txt index 5b13beaff..938c73c3b 100644 --- a/Components/Transforms/SimilarityTransform/CMakeLists.txt +++ b/Components/Transforms/SimilarityTransform/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_ELXCOMPONENT( SimilarityTransformElastix # Was OFF by default before elastix elxSimilarityTransform.hxx elxSimilarityTransform.cxx itkSimilarityTransform.h) - diff --git a/Components/Transforms/SplineKernelTransform/CMakeLists.txt b/Components/Transforms/SplineKernelTransform/CMakeLists.txt index 97cb12959..9de2869e0 100644 --- a/Components/Transforms/SplineKernelTransform/CMakeLists.txt +++ b/Components/Transforms/SplineKernelTransform/CMakeLists.txt @@ -15,4 +15,3 @@ ADD_ELXCOMPONENT( SplineKernelTransform itkThinPlateSplineKernelTransform2.hxx itkVolumeSplineKernelTransform2.h itkVolumeSplineKernelTransform2.hxx) - diff --git a/Components/Transforms/TranslationStackTransform/CMakeLists.txt b/Components/Transforms/TranslationStackTransform/CMakeLists.txt index b4bd218a7..417afee9a 100644 --- a/Components/Transforms/TranslationStackTransform/CMakeLists.txt +++ b/Components/Transforms/TranslationStackTransform/CMakeLists.txt @@ -3,4 +3,3 @@ ADD_ELXCOMPONENT( TranslationStackTransform elxTranslationStackTransform.hxx elxTranslationStackTransform.cxx itkTranslationStackTransform.h) - diff --git a/Components/Transforms/TranslationTransform/CMakeLists.txt b/Components/Transforms/TranslationTransform/CMakeLists.txt index e3f57ee7f..d350d9d2c 100644 --- a/Components/Transforms/TranslationTransform/CMakeLists.txt +++ b/Components/Transforms/TranslationTransform/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( TranslationTransformElastix elxTranslationTransform.h elxTranslationTransform.hxx elxTranslationTransform.cxx) - diff --git a/Components/Transforms/WeightedCombinationTransform/CMakeLists.txt b/Components/Transforms/WeightedCombinationTransform/CMakeLists.txt index 5d9e728f1..e3cd8054a 100644 --- a/Components/Transforms/WeightedCombinationTransform/CMakeLists.txt +++ b/Components/Transforms/WeightedCombinationTransform/CMakeLists.txt @@ -5,4 +5,3 @@ ADD_ELXCOMPONENT( WeightedCombinationTransformElastix # Was OFF by default befor elxWeightedCombinationTransform.cxx itkWeightedCombinationTransform.h itkWeightedCombinationTransform.hxx) - diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 73e6bf6e1..99f7c9a60 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -297,4 +297,3 @@ endif() # defining the elastix compilation types. add_subdirectory(Install) - diff --git a/Core/Install/CMakeLists.txt b/Core/Install/CMakeLists.txt index 46cc7823b..e0e5ad345 100644 --- a/Core/Install/CMakeLists.txt +++ b/Core/Install/CMakeLists.txt @@ -155,4 +155,3 @@ if(ELASTIX_USE_OPENCL) ${elastix_BINARY_DIR}/elxOpenCLSupportedImageTypes.h @ONLY) endif() - diff --git a/Core/Install/elxSupportedImageTypes.h.in b/Core/Install/elxSupportedImageTypes.h.in index e19f3d344..b2513353d 100644 --- a/Core/Install/elxSupportedImageTypes.h.in +++ b/Core/Install/elxSupportedImageTypes.h.in @@ -55,4 +55,3 @@ namespace elastix } // end namespace elastix #endif // end #ifndef elxSupportedImageTypes_h - diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 808d6d222..b138c499f 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -453,7 +453,7 @@ if(ELASTIX_BUILD_EXECUTABLE) file(MAKE_DIRECTORY "${TestOutputDir}/OutputDirectoryPathContainingSpacesTest/path with spaces/name with spaces") add_test(NAME OutputDirectoryPathContainingSpacesTest COMMAND ${EXECUTABLE_OUTPUT_PATH}/elastix - -f "${TestDataDir}/2D_2x2_square_object_at_(1,3).mhd" + -f "${TestDataDir}/2D_2x2_square_object_at_(1,3).mhd" -m "${TestDataDir}/2D_2x2_square_object_at_(2,1).mhd" -p "${TestDataDir}/parameters.2D.NC.translation.ASGD.txt" -out "${TestOutputDir}/OutputDirectoryPathContainingSpacesTest/path with spaces/name with spaces") diff --git a/Testing/Dashboard/elxDashboardCommon.cmake b/Testing/Dashboard/elxDashboardCommon.cmake index 054b05649..a0ba0904f 100644 --- a/Testing/Dashboard/elxDashboardCommon.cmake +++ b/Testing/Dashboard/elxDashboardCommon.cmake @@ -238,4 +238,3 @@ else() # Submit results, retry every 5 minutes for a maximum of two hours ctest_submit(RETRY_COUNT 24 RETRY_DELAY 300) endif() - diff --git a/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake b/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake index a9e311680..49c6f01e1 100644 --- a/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake +++ b/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake @@ -70,4 +70,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_BIGR_winXP32_VS2008.cmake b/Testing/Dashboard/elxDashboard_BIGR_winXP32_VS2008.cmake index ce1372d1c..8ab8df8a0 100644 --- a/Testing/Dashboard/elxDashboard_BIGR_winXP32_VS2008.cmake +++ b/Testing/Dashboard/elxDashboard_BIGR_winXP32_VS2008.cmake @@ -66,4 +66,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Debug.cmake b/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Debug.cmake index f1b2bc1ba..1433882cd 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Debug.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Debug.cmake @@ -81,4 +81,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Release.cmake b/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Release.cmake index 072797491..2562b2b1f 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Release.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_linux64_clang_Release.cmake @@ -92,4 +92,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Debug.cmake b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Debug.cmake index 96f0e6840..f1fd151d6 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Debug.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Debug.cmake @@ -81,4 +81,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release.cmake b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release.cmake index 858f24a91..9acfd9a0d 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release.cmake @@ -64,4 +64,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release_perf.cmake b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release_perf.cmake index 66128cd13..9986cdc2d 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release_perf.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_linux64_gcc_Release_perf.cmake @@ -65,4 +65,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_macosx64_gcc.cmake b/Testing/Dashboard/elxDashboard_LKEB_macosx64_gcc.cmake index 4bf2cb53b..2d47eb313 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_macosx64_gcc.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_macosx64_gcc.cmake @@ -59,4 +59,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_win10-64_VS2015.cmake b/Testing/Dashboard/elxDashboard_LKEB_win10-64_VS2015.cmake index dcfe14aa3..9ee5c5576 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_win10-64_VS2015.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_win10-64_VS2015.cmake @@ -63,4 +63,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/Dashboard/elxDashboard_LKEB_win7-64_VS2010.cmake b/Testing/Dashboard/elxDashboard_LKEB_win7-64_VS2010.cmake index 4d8ecd82f..0d8aaacb5 100644 --- a/Testing/Dashboard/elxDashboard_LKEB_win7-64_VS2010.cmake +++ b/Testing/Dashboard/elxDashboard_LKEB_win7-64_VS2010.cmake @@ -63,4 +63,3 @@ USE_ALL_COMPONENTS:BOOL=ON # Load the common dashboard script. include(${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake) - diff --git a/Testing/PythonTests/CMakeLists.txt b/Testing/PythonTests/CMakeLists.txt index 13b91f312..0ca2df093 100644 --- a/Testing/PythonTests/CMakeLists.txt +++ b/Testing/PythonTests/CMakeLists.txt @@ -1,5 +1,5 @@ # ========================================================================= -# +# # Copyright UMC Utrecht and contributors # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Testing/PythonTests/TransformParameters/Transform_to_float_5x6.txt b/Testing/PythonTests/TransformParameters/Transform_to_float_5x6.txt index e2d55a203..fd3a49f89 100644 --- a/Testing/PythonTests/TransformParameters/Transform_to_float_5x6.txt +++ b/Testing/PythonTests/TransformParameters/Transform_to_float_5x6.txt @@ -8,4 +8,4 @@ (Size 5 6) (Spacing 1 1) (Transform "TranslationTransform") -(TransformParameters 0 0) \ No newline at end of file +(TransformParameters 0 0) diff --git a/Testing/PythonTests/TransformParameters/Transform_to_int_5x6.txt b/Testing/PythonTests/TransformParameters/Transform_to_int_5x6.txt index 3ec9dbff8..abb3c1f1f 100644 --- a/Testing/PythonTests/TransformParameters/Transform_to_int_5x6.txt +++ b/Testing/PythonTests/TransformParameters/Transform_to_int_5x6.txt @@ -8,4 +8,4 @@ (Size 5 6) (Spacing 1 1) (Transform "TranslationTransform") -(TransformParameters 0 0) \ No newline at end of file +(TransformParameters 0 0) diff --git a/Testing/PythonTests/TransformParameters/Translation(0,0).txt b/Testing/PythonTests/TransformParameters/Translation(0,0).txt index af94eb97d..8bf2c5f3d 100644 --- a/Testing/PythonTests/TransformParameters/Translation(0,0).txt +++ b/Testing/PythonTests/TransformParameters/Translation(0,0).txt @@ -7,4 +7,4 @@ (Size 1 1) (Spacing 1 1) (Transform "TranslationTransform") -(TransformParameters 0 0) \ No newline at end of file +(TransformParameters 0 0) diff --git a/Testing/PythonTests/TransformParameters/Translation(0,0,0).txt b/Testing/PythonTests/TransformParameters/Translation(0,0,0).txt index 6320645aa..f2a841362 100644 --- a/Testing/PythonTests/TransformParameters/Translation(0,0,0).txt +++ b/Testing/PythonTests/TransformParameters/Translation(0,0,0).txt @@ -7,4 +7,4 @@ (Size 1 1 1) (Spacing 1 1 1) (Transform "TranslationTransform") -(TransformParameters 0 0 0) \ No newline at end of file +(TransformParameters 0 0 0) diff --git a/Testing/PythonTests/TransformParameters/Translation(1,-2)-CustomResultImageName.txt b/Testing/PythonTests/TransformParameters/Translation(1,-2)-CustomResultImageName.txt index 7ba186792..32ed4c910 100644 --- a/Testing/PythonTests/TransformParameters/Translation(1,-2)-CustomResultImageName.txt +++ b/Testing/PythonTests/TransformParameters/Translation(1,-2)-CustomResultImageName.txt @@ -9,4 +9,4 @@ (Size 5 6) (Spacing 1 1) (Transform "TranslationTransform") -(TransformParameters 1 -2) \ No newline at end of file +(TransformParameters 1 -2) diff --git a/Testing/PythonTests/TransformParameters/Translation(1,-2).txt b/Testing/PythonTests/TransformParameters/Translation(1,-2).txt index 0f3151557..0103a5f07 100644 --- a/Testing/PythonTests/TransformParameters/Translation(1,-2).txt +++ b/Testing/PythonTests/TransformParameters/Translation(1,-2).txt @@ -8,4 +8,4 @@ (Size 5 6) (Spacing 1 1) (Transform "TranslationTransform") -(TransformParameters 1 -2) \ No newline at end of file +(TransformParameters 1 -2) diff --git a/Testing/PythonTests/requirements.txt b/Testing/PythonTests/requirements.txt index c333cb251..34912c792 100644 --- a/Testing/PythonTests/requirements.txt +++ b/Testing/PythonTests/requirements.txt @@ -1,3 +1,3 @@ itk SimpleITK -numpy \ No newline at end of file +numpy diff --git a/dox/createWebsite b/dox/createWebsite index 364eaea6a..dd054fbda 100755 --- a/dox/createWebsite +++ b/dox/createWebsite @@ -36,8 +36,8 @@ # 18. copy $tempdir to the website, using winscp. # # This script is rather nongeneric. It only works on stefan's computer :) -# -# Prerequisites: install Dot, doxygen, svn, 7z, cygwin or gitBash (to run this script), cmake, itk +# +# Prerequisites: install Dot, doxygen, svn, 7z, cygwin or gitBash (to run this script), cmake, itk # arg="$1" @@ -147,14 +147,14 @@ if [ "$arg" = "zipwin" ] then currentdir=`pwd` cd $exportdirwin - cd bin + cd bin # call cpack cpack -C Release --config CPackConfig.cmake cpack -C Release --config CPackSourceConfig.cmake # rename zips to website convention mv elastix-$fullversion-win64.zip elastix_windows64_v$version.zip mv elastix-$fullversion-win64.exe elastix_windows64_v$version.exe - mv elastix-$fullversion-Source.zip elastix_sources_v$version.zip + mv elastix-$fullversion-Source.zip elastix_sources_v$version.zip # create help zip cd ../help helpzip="elastix_example_v$version.zip" @@ -197,4 +197,3 @@ fi # copy using winscp exit 0 - diff --git a/dox/doxygen/DoxygenFooter.html.in b/dox/doxygen/DoxygenFooter.html.in index fbb1be661..44ec6cd2e 100644 --- a/dox/doxygen/DoxygenFooter.html.in +++ b/dox/doxygen/DoxygenFooter.html.in @@ -12,4 +12,3 @@ - diff --git a/dox/doxygen/doxdate.bat b/dox/doxygen/doxdate.bat index dd74d8c58..71ed7640d 100755 --- a/dox/doxygen/doxdate.bat +++ b/dox/doxygen/doxdate.bat @@ -1,3 +1,2 @@ @date /T - diff --git a/dox/doxygen/elastix.css b/dox/doxygen/elastix.css index 2dea9da20..39cbc16b1 100644 --- a/dox/doxygen/elastix.css +++ b/dox/doxygen/elastix.css @@ -39,7 +39,7 @@ DIV.header, DIV.summary, DIV.navpath { color: #CC0000; border: none; margin: 2px; -} +} .navpath li.navelem a { color: #000000; } @@ -52,7 +52,7 @@ DIV.header, DIV.summary, DIV.navpath { DIV.header, DIV.summary, DIV.navpath ul { background-image:none; border: none; - margin: 2px; + margin: 2px; } DIV.summary @@ -63,7 +63,7 @@ DIV.summary padding-top: 15px; width: 50%; text-align: right; -} +} A.qindex { text-decoration: none; @@ -98,7 +98,7 @@ A.qindexHL:hover { } A.qindexHL:visited { text-decoration: none; background-color: #CC0000; color: #ffffff } - + A.el { text-decoration: none; @@ -278,7 +278,7 @@ SPAN.charliteral { color: #008080 } border-left-color: #E0E0E0; border-right-style: none; border-bottom-style: none; - border-left-style: none; + border-left-style: none; background-color: #FFFBD7; color: #000000; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; diff --git a/dox/example b/dox/example index 6ce6044ba..5bf870a7c 100755 --- a/dox/example +++ b/dox/example @@ -78,5 +78,3 @@ echo \# If you have any questions, please register for the elastix echo \# user mailing-list and post your question to the community! echo \# In that way you will also be kept informed on updates. echo \# - - diff --git a/dox/example.bat b/dox/example.bat index fb422b0ae..108ec3f85 100644 --- a/dox/example.bat +++ b/dox/example.bat @@ -68,4 +68,3 @@ transformix -jac all -out exampleoutput -tp exampleoutput/TransformParameters.1. @echo # user mailing-list and post your question to the community! @echo # In that way you will also be kept informed on updates. @echo # - diff --git a/dox/exampleinput/parameters_Affine.txt b/dox/exampleinput/parameters_Affine.txt index 889d36f71..caf2491f7 100644 --- a/dox/exampleinput/parameters_Affine.txt +++ b/dox/exampleinput/parameters_Affine.txt @@ -2,9 +2,9 @@ // C-style comments: // // The internal pixel type, used for internal computations -// Leave to float in general. -// NB: this is not the type of the input images! The pixel -// type of the input images is automatically read from the +// Leave to float in general. +// NB: this is not the type of the input images! The pixel +// type of the input images is automatically read from the // images themselves. // This setting can be changed to "short" to save some memory // in case of very large 3D images. @@ -20,7 +20,7 @@ // Specify whether you want to take into account the so-called // direction cosines of the images. Recommended: true. // In some cases, the direction cosines of the image are corrupt, -// due to image format conversions for example. In that case, you +// due to image format conversions for example. In that case, you // may want to set this option to "false". (UseDirectionCosines "true") @@ -48,7 +48,7 @@ // ***************** Transformation ************************** // Scales the affine matrix elements compared to the translations, to make -// sure they are in the same range. In general, it's best to +// sure they are in the same range. In general, it's best to // use automatic scales estimation: (AutomaticScalesEstimation "true") @@ -69,7 +69,7 @@ //(NumberOfHistogramBins 16 32 64) (NumberOfHistogramBins 32) -// If you use a mask, this option is important. +// If you use a mask, this option is important. // If the mask serves as region of interest, set it to false. // If the mask indicates which pixels are valid, then set it to true. // If you do not use a mask, the option doesn't matter. @@ -126,7 +126,7 @@ // Order of B-Spline interpolation used during registration/optimisation. // It may improve accuracy if you set this to 3. Never use 0. -// An order of 1 gives linear interpolation. This is in most +// An order of 1 gives linear interpolation. This is in most // applications a good choice. (BSplineInterpolationOrder 1) @@ -150,5 +150,3 @@ // The pixel type and format of the resulting deformed moving image (ResultImagePixelType "short") (ResultImageFormat "mhd") - - diff --git a/dox/exampleinput/parameters_BSpline.txt b/dox/exampleinput/parameters_BSpline.txt index 341108658..3f8f7e965 100644 --- a/dox/exampleinput/parameters_BSpline.txt +++ b/dox/exampleinput/parameters_BSpline.txt @@ -2,9 +2,9 @@ // C-style comments: // // The internal pixel type, used for internal computations -// Leave to float in general. -// NB: this is not the type of the input images! The pixel -// type of the input images is automatically read from the +// Leave to float in general. +// NB: this is not the type of the input images! The pixel +// type of the input images is automatically read from the // images themselves. // This setting can be changed to "short" to save some memory // in case of very large 3D images. @@ -20,7 +20,7 @@ // Specify whether you want to take into account the so-called // direction cosines of the images. Recommended: true. // In some cases, the direction cosines of the image are corrupt, -// due to image format conversions for example. In that case, you +// due to image format conversions for example. In that case, you // may want to set this option to "false". (UseDirectionCosines "true") @@ -47,8 +47,8 @@ // ***************** Transformation ************************** -// The control point spacing of the bspline transformation in -// the finest resolution level. Can be specified for each +// The control point spacing of the bspline transformation in +// the finest resolution level. Can be specified for each // dimension differently. Unit: mm. // The lower this value, the more flexible the deformation. // Low values may improve the accuracy, but may also cause @@ -63,7 +63,7 @@ //(FinalGridSpacingInVoxels 16) // By default the grid spacing is halved after every resolution, -// such that the final grid spacing is obtained in the last +// such that the final grid spacing is obtained in the last // resolution level. You can also specify your own schedule, // if you uncomment the following line: //(GridSpacingSchedule 4.0 4.0 2.0 1.0) @@ -82,7 +82,7 @@ //(NumberOfHistogramBins 16 32 64) (NumberOfHistogramBins 32) -// If you use a mask, this option is important. +// If you use a mask, this option is important. // If the mask serves as region of interest, set it to false. // If the mask indicates which pixels are valid, then set it to true. // If you do not use a mask, the option doesn't matter. @@ -140,7 +140,7 @@ // Order of B-Spline interpolation used during registration/optimisation. // It may improve accuracy if you set this to 3. Never use 0. -// An order of 1 gives linear interpolation. This is in most +// An order of 1 gives linear interpolation. This is in most // applications a good choice. (BSplineInterpolationOrder 1) @@ -164,5 +164,3 @@ // The pixel type and format of the resulting deformed moving image (ResultImagePixelType "short") (ResultImageFormat "mhd") - - diff --git a/dox/exampleinput/parameters_Rigid.txt b/dox/exampleinput/parameters_Rigid.txt index adce9f99c..0f0b55201 100644 --- a/dox/exampleinput/parameters_Rigid.txt +++ b/dox/exampleinput/parameters_Rigid.txt @@ -2,9 +2,9 @@ // C-style comments: // // The internal pixel type, used for internal computations -// Leave to float in general. -// NB: this is not the type of the input images! The pixel -// type of the input images is automatically read from the +// Leave to float in general. +// NB: this is not the type of the input images! The pixel +// type of the input images is automatically read from the // images themselves. // This setting can be changed to "short" to save some memory // in case of very large 3D images. @@ -20,7 +20,7 @@ // Specify whether you want to take into account the so-called // direction cosines of the images. Recommended: true. // In some cases, the direction cosines of the image are corrupt, -// due to image format conversions for example. In that case, you +// due to image format conversions for example. In that case, you // may want to set this option to "false". (UseDirectionCosines "true") @@ -48,7 +48,7 @@ // ***************** Transformation ************************** // Scales the rotations compared to the translations, to make -// sure they are in the same range. In general, it's best to +// sure they are in the same range. In general, it's best to // use automatic scales estimation: (AutomaticScalesEstimation "true") @@ -69,7 +69,7 @@ //(NumberOfHistogramBins 16 32 64) (NumberOfHistogramBins 32) -// If you use a mask, this option is important. +// If you use a mask, this option is important. // If the mask serves as region of interest, set it to false. // If the mask indicates which pixels are valid, then set it to true. // If you do not use a mask, the option doesn't matter. @@ -126,7 +126,7 @@ // Order of B-Spline interpolation used during registration/optimisation. // It may improve accuracy if you set this to 3. Never use 0. -// An order of 1 gives linear interpolation. This is in most +// An order of 1 gives linear interpolation. This is in most // applications a good choice. (BSplineInterpolationOrder 1) @@ -150,5 +150,3 @@ // The pixel type and format of the resulting deformed moving image (ResultImagePixelType "short") (ResultImageFormat "mhd") - - diff --git a/dox/exampleinput/parameters_Translation.txt b/dox/exampleinput/parameters_Translation.txt index c768ee235..a52df7135 100644 --- a/dox/exampleinput/parameters_Translation.txt +++ b/dox/exampleinput/parameters_Translation.txt @@ -2,9 +2,9 @@ // C-style comments: // // The internal pixel type, used for internal computations -// Leave to float in general. -// NB: this is not the type of the input images! The pixel -// type of the input images is automatically read from the +// Leave to float in general. +// NB: this is not the type of the input images! The pixel +// type of the input images is automatically read from the // images themselves. // This setting can be changed to "short" to save some memory // in case of very large 3D images. @@ -20,7 +20,7 @@ // Specify whether you want to take into account the so-called // direction cosines of the images. Recommended: true. // In some cases, the direction cosines of the image are corrupt, -// due to image format conversions for example. In that case, you +// due to image format conversions for example. In that case, you // may want to set this option to "false". (UseDirectionCosines "true") @@ -69,7 +69,7 @@ //(NumberOfHistogramBins 16 32 64) (NumberOfHistogramBins 32) -// If you use a mask, this option is important. +// If you use a mask, this option is important. // If the mask serves as region of interest, set it to false. // If the mask indicates which pixels are valid, then set it to true. // If you do not use a mask, the option doesn't matter. @@ -126,7 +126,7 @@ // Order of B-Spline interpolation used during registration/optimisation. // It may improve accuracy if you set this to 3. Never use 0. -// An order of 1 gives linear interpolation. This is in most +// An order of 1 gives linear interpolation. This is in most // applications a good choice. (BSplineInterpolationOrder 1) @@ -150,5 +150,3 @@ // The pixel type and format of the resulting deformed moving image (ResultImagePixelType "short") (ResultImageFormat "mhd") - - diff --git a/dox/exampleinput/solution_deformedmovingimage.mhd b/dox/exampleinput/solution_deformedmovingimage.mhd index 8f3680786..54b1d9f08 100644 --- a/dox/exampleinput/solution_deformedmovingimage.mhd +++ b/dox/exampleinput/solution_deformedmovingimage.mhd @@ -1,8 +1,8 @@ NDims = 2 DimSize = 256 256 ElementType = MET_SHORT -Offset = 0.0 0.0 +Offset = 0.0 0.0 ElementSpacing = 1.0 1.0 -ElementByteOrderMSB = False +ElementByteOrderMSB = False ElementNumberOfChannels = 1 ElementDataFile = solution_deformedmovingimage.raw diff --git a/dox/externalproject/README.txt b/dox/externalproject/README.txt index 60abb36b1..b43dad038 100644 --- a/dox/externalproject/README.txt +++ b/dox/externalproject/README.txt @@ -1 +1 @@ -This folder contains an example of an external project that uses code/libraries from elastix. It is meant to be built outside the elastix tree. You need to have compiled elastix first. Then run cmake with this folder as source directory. A small test executable will be created. \ No newline at end of file +This folder contains an example of an external project that uses code/libraries from elastix. It is meant to be built outside the elastix tree. You need to have compiled elastix first. Then run cmake with this folder as source directory. A small test executable will be created. diff --git a/dox/misc/ReleaseCMakeSettings.txt b/dox/misc/ReleaseCMakeSettings.txt index e8b216655..87d5c6b3e 100644 --- a/dox/misc/ReleaseCMakeSettings.txt +++ b/dox/misc/ReleaseCMakeSettings.txt @@ -14,4 +14,3 @@ SET( ELASTIX_IMAGE_2D_PIXELTYPES "float" CACHE STRING "2D support" ) SET( ELASTIX_IMAGE_3D_PIXELTYPES "short;float" CACHE STRING "3D support" ) SET( ELASTIX_IMAGE_4D_PIXELTYPES "short" CACHE STRING "4D support" ) SET( USE_ALL_COMPONENTS ON CACHE BOOL "Compile all elastix components") - diff --git a/pixi.toml b/pixi.toml index 6dd908119..29e4c2782 100644 --- a/pixi.toml +++ b/pixi.toml @@ -10,7 +10,7 @@ clean = { cmd = "git clean -fdx", description = "Clean the repository" } python = ">=3.12.0,<3.13" [feature.pre-commit.dependencies] -pre-commit = ">=4.0.1,<5" +pre-commit = ">=4.1.0,<5" [feature.pre-commit.tasks] pre-commit-install = { cmd = "pre-commit install -f -t pre-commit -t prepare-commit-msg -t commit-msg", description = "Install pre-commit hooks" } diff --git a/tools/runelastixlinux b/tools/runelastixlinux index 74207be82..e419e3a69 100755 --- a/tools/runelastixlinux +++ b/tools/runelastixlinux @@ -31,4 +31,3 @@ elastix $* # after exitting this script, the LD_LIBRARY_PATH is # automatically as it was before running this script. - diff --git a/tools/runtransformixlinux b/tools/runtransformixlinux index c496873f5..860f90a98 100755 --- a/tools/runtransformixlinux +++ b/tools/runtransformixlinux @@ -31,4 +31,3 @@ transformix $* # after exitting this script, the LD_LIBRARY_PATH is # automatically as it was before running this script. -