diff --git a/Base/QTApp/qSlicerApplicationHelper.cxx b/Base/QTApp/qSlicerApplicationHelper.cxx index 1f25fbc6fbe0514b19637fb7914cb16ed28aee14..e332144a5eb6be59a448c1856a517cec924b7a9c 100644 --- a/Base/QTApp/qSlicerApplicationHelper.cxx +++ b/Base/QTApp/qSlicerApplicationHelper.cxx @@ -66,6 +66,10 @@ # include #endif +#ifdef _WIN32 +#include //for SetProcessDPIAware +#endif + //---------------------------------------------------------------------------- qSlicerApplicationHelper::qSlicerApplicationHelper(QObject * parent) : Superclass(parent) { diff --git a/Libs/MRML/Core/vtkITKTransformConverter.h b/Libs/MRML/Core/vtkITKTransformConverter.h index 81476593555ca8dc894fd72d84c46a55ecdda3bc..91de540bc015dbb3f68c919ede577eb6f81ac08d 100644 --- a/Libs/MRML/Core/vtkITKTransformConverter.h +++ b/Libs/MRML/Core/vtkITKTransformConverter.h @@ -579,11 +579,7 @@ template bool vtkITKTransformConverter::SetITKBS // * mesh origin X, Y, Z (position of the boundary node before the grid) // * mesh spacing X, Y, Z // * mesh direction 3x3 matrix (first row, second row, third row) -#if defined(ITK_FIXED_PARAMETERS_ARE_DOUBLE) // After 4.8.1 typename BSplineTransformType::FixedParametersType transformFixedParamsItk; -#else //Pre 4.8.1 - typename BSplineTransformType::ParametersType transformFixedParamsItk; -#endif const unsigned int numberOfFixedParameters=VTKDimension*(VTKDimension+3); transformFixedParamsItk.SetSize(numberOfFixedParameters); diff --git a/SuperBuild.cmake b/SuperBuild.cmake index af89cc7f76f5028910b6d605710ec315b43a4b27..c070426c752c8b7243cf833c2a514cc532697a94 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -259,7 +259,7 @@ set(BRAINSTools_options ) Slicer_Remote_Add(BRAINSTools GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/Slicer/BRAINSTools.git" - GIT_TAG "c60de5558a5fcb731ef30c1acef478b76bd036fd" # master (from 2017-11-29, post v4.7.1) + GIT_TAG "87da22c2e365da72d3c0dea2634c4efa73dbeab3" # 2017-12-09 LICENSE_FILES "http://www.apache.org/licenses/LICENSE-2.0.txt" OPTION_NAME Slicer_BUILD_BRAINSTOOLS OPTION_DEPENDS "Slicer_BUILD_CLI_SUPPORT;Slicer_BUILD_CLI" diff --git a/SuperBuild/External_ITKv4.cmake b/SuperBuild/External_ITKv4.cmake index c5c0ce52c7cf5f706444fd3359298907e026cfdf..231c1bf88671fc3b72d524318717f186dbc81b35 100644 --- a/SuperBuild/External_ITKv4.cmake +++ b/SuperBuild/External_ITKv4.cmake @@ -33,7 +33,7 @@ if(NOT DEFINED ITK_DIR AND NOT Slicer_USE_SYSTEM_${proj}) ExternalProject_SetIfNotDefined( Slicer_${proj}_GIT_TAG - "bc0d1723cb4442be2f74ae4585d6c6be1029e3a4" # slicer-v4.13.0-2018-05-25-32608b68bd + "a44f430b3edb5fff62671b4ba87cf41c60ee272b" # slicer-v4.13.1-2018-08-17-cdc3e57 QUIET ) @@ -98,7 +98,7 @@ if(NOT DEFINED ITK_DIR AND NOT Slicer_USE_SYSTEM_${proj}) -DITK_INSTALL_LIBRARY_DIR:PATH=${Slicer_INSTALL_LIB_DIR} -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF - -DITK_LEGACY_REMOVE:BOOL=OFF + -DITK_LEGACY_REMOVE:BOOL=ON -DITKV3_COMPATIBILITY:BOOL=OFF -DITK_BUILD_DEFAULT_MODULES:BOOL=ON -DModule_ITKReview:BOOL=ON