Merge branch 'bug-13091-wrong-3d-interpolation-result' into…
3fff8c3964f7
Actions

Description

Merge branch 'bug-13091-wrong-3d-interpolation-result' into personal/engelm/correct-interpolation-on-rotated-images

Conflicts:
Modules/Segmentation/Algorithms/mitkCreateDistanceImageFromSurfaceFilter.cpp
Modules/Segmentation/Algorithms/mitkCreateDistanceImageFromSurfaceFilter.h

Merge branch 'bug-13091-wrong-3d-interpolation-result' into…3fff8c3964f7Actions

Description

Details

Event Timeline

Merged Changes

Changes (934)

rMITK3fff8c3964f7

Applications/PluginGenerator/CMakeLists.txt

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake

BlueBerry/CMakeLists.txt

CMake/MITKDashboardScript.TEMPLATE.cmake

CMake/MITKDashboardSetup.cmake

CMake/PackageDepends/MITK_ITK_Config.cmake

CMake/PackageDepends/MITK_SOFA_Config.cmake

CMake/mitkMacroCreateModuleTests.cmake

CMake/mitkMacroInstallHelperApp.cmake

CMake/mitkSetupVariables.cmake

CMakeExternals/CTK.cmake

CMakeExternals/CableSwig.cmake

CMakeExternals/GDCM.cmake

CMakeExternals/ITK.cmake

CMakeExternals/MITKData.cmake

CMakeExternals/MITKData.cmake.BACKUP.9452.cmake

CMakeExternals/MITKData.cmake.BASE.9452.cmake

CMakeExternals/MITKData.cmake.LOCAL.9452.cmake

CMakeExternals/MITKData.cmake.REMOTE.9452.cmake

CMakeExternals/OpenCV.cmake

CMakeExternals/PatchGDCM-2.0.18.cmake

CMakeExternals/PatchITK-3.20.cmake

CMakeExternals/PatchITK-4.3.1.cmake

CMakeExternals/PatchSOFA-rev8935.cmake

CMakeExternals/PatchSOFA-rev9479.cmake

CMakeExternals/SOFA.cmake

CMakeExternals/VTK.cmake

CMakeLists.txt

Core/Code/Algorithms/itkLocalVariationImageFilter.h

Core/Code/Algorithms/itkLocalVariationImageFilter.txx

Core/Code/Algorithms/itkMITKScalarImageToHistogramGenerator.h

Core/Code/Algorithms/itkMITKScalarImageToHistogramGenerator.txx

Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.h

Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.txx

Core/Code/Algorithms/mitkBaseDataSource.cpp

Core/Code/Algorithms/mitkBaseDataSource.h

Core/Code/Algorithms/mitkBaseProcess.cpp

Core/Code/Algorithms/mitkBaseProcess.h

Core/Code/Algorithms/mitkDataNodeSource.cpp

Core/Code/Algorithms/mitkDataNodeSource.h

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

Core/Code/Algorithms/mitkExtractSliceFilter.h

Core/Code/Algorithms/mitkGeometry2DDataToSurfaceFilter.h

Core/Code/Algorithms/mitkImageSource.cpp

Core/Code/Algorithms/mitkImageSource.h

Core/Code/Algorithms/mitkImageToImageFilter.cpp

Core/Code/Algorithms/mitkImageToImageFilter.h

Core/Code/Algorithms/mitkPointSetSource.cpp

Core/Code/Algorithms/mitkPointSetSource.h

Core/Code/Algorithms/mitkPointSetToPointSetFilter.h

Core/Code/Algorithms/mitkRGBToRGBACastImageFilter.cpp

Core/Code/Algorithms/mitkSurfaceSource.cpp

Core/Code/Algorithms/mitkSurfaceSource.h

Core/Code/Algorithms/mitkSurfaceToSurfaceFilter.cpp

Core/Code/Algorithms/mitkSurfaceToSurfaceFilter.h

Core/Code/CMakeLists.txt

Core/Code/Common/mitkCommon.h

Core/Code/Common/mitkCoreObjectFactory.cpp

Core/Code/Common/mitkException.h

Core/Code/Common/mitkTestingMacros.h

Core/Code/Controllers/mitkSliceNavigationController.cpp

Core/Code/Controllers/mitkSliceNavigationController.h

Core/Code/DataManagement/itkVtkAbstractTransform.h

Core/Code/DataManagement/itkVtkAbstractTransform.txx

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

Core/Code/DataManagement/mitkAbstractTransformGeometry.h

Core/Code/DataManagement/mitkAnnotationProperty.cpp

Core/Code/DataManagement/mitkAnnotationProperty.h

Core/Code/DataManagement/mitkBaseData.cpp

Core/Code/DataManagement/mitkBaseData.h

Core/Code/DataManagement/mitkBaseDataTestImplementation.h

Core/Code/DataManagement/mitkBaseProperty.cpp

Merge branch 'bug-13091-wrong-3d-interpolation-result' into…
3fff8c3964f7
Actions