HomePhabricator

Merge branch 'T22613-Save_LazyFieldByFile'

Description

Merge branch 'T22613-Save_LazyFieldByFile'

  1. Conflicts:
  2. Applications/Matcher/source/matchRHelper.cpp
  3. Code/Algorithms/Plastimatch/test/mapDummyPlastimatch.cpp
  4. Code/Core/include/mapDimensionlessRegistrationKernelBase.h
  5. Code/Core/include/mapNullRegistrationKernel.h
  6. Code/Core/include/mapNullRegistrationKernel.tpp
  7. Code/Core/include/mapRegistrationKernel.h
  8. Code/Core/include/mapRegistrationKernel.tpp
  9. Code/Core/include/mapRegistrationKernelBase.h
  10. Code/Core/test/mapRegistrationTest.cpp
  11. Code/Core/test/mapTestKernelBase.h
  12. Code/IO/files.cmake
  13. Code/IO/include/mapImageReader.tpp
  14. Code/IO/include/mapKernelWriterLoadPolicy.h
  15. Code/IO/include/mapKernelWriterLoadPolicy.tpp
  16. Code/IO/test/mapExpandingFieldKernelWriterTest.cpp
  17. Code/IO/test/mapFieldKernelLoaderTest.cpp
  18. Code/IO/test/mapIOTests.cpp
  19. Code/IO/test/mapLazyFileFieldKernelLoaderTest.cpp
  20. Code/IO/test/mapMatrixModelBasedKernelWriterTest.cpp
  21. Code/IO/test/mapRegistrationFileWriterTest.cpp
  22. Code/IO/tests.cmake
  23. Testing/Data/Core/registrationFileWriterReader_Ref1.mapr
  24. Testing/Data/Core/registrationFileWriterReader_Ref2.mapr
  25. Testing/Data/Core/registrationFileWriterReader_Ref3.mapr
  26. Testing/Data/Core/registrationFileWriterReader_Ref4.mapr
  27. Testing/Data/Core/registrationFileWriterReader_Ref4_legacy.mapr
  28. Testing/Data/Core/registrationFileWriterReader_Ref5.mapr
  29. Testing/Data/Core/registrationFileWriterReader_Ref6.mapr
  30. Testing/Data/Core/savedReg1.mapr
  31. Testing/Data/Core/savedReg2.mapr
  32. Testing/Data/Core/savedReg3.mapr

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance
flocaAuthored on Apr 13 2018, 2:25 PM
flocaPushed on Apr 13 2018, 2:26 PM
Parents
rMP745550c32da9: some gcc fixes
rMP40436e2b7d3b: Replace Windows line endings
Branches
Unknown
Tags
Unknown