From 72e683d4395a292ab988692d131bdfad247325cb Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Wed, 23 Jan 2019 10:57:10 +0100 Subject: [PATCH] STYLE: remove trailing spaces and special characters --- COPYRIGHT.TXT | 12 +- README.rst | 2 +- applications/CMakeLists.txt | 6 +- .../rtkadmmtotalvariation/CMakeLists.txt | 4 +- .../rtkadmmtotalvariation.cxx | 4 +- applications/rtkadmmwavelets/CMakeLists.txt | 4 +- .../rtkadmmwavelets/rtkadmmwavelets.cxx | 2 +- .../rtkamsterdamshroud/CMakeLists.txt | 4 +- .../rtkbackprojections/CMakeLists.txt | 4 +- .../rtkbioscangeometry/CMakeLists.txt | 4 +- .../rtkconjugategradient/CMakeLists.txt | 4 +- .../rtkconjugategradient.cxx | 2 +- .../rtkdigisensgeometry/CMakeLists.txt | 4 +- .../rtkdrawgeometricphantom/CMakeLists.txt | 4 +- .../rtkdrawshepploganphantom/CMakeLists.txt | 4 +- .../rtkdualenergyforwardmodel/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../rtkelektasynergygeometry/CMakeLists.txt | 4 +- .../rtkextractphasesignal/CMakeLists.txt | 4 +- .../rtkextractshroudsignal/CMakeLists.txt | 4 +- applications/rtkfdk/CMakeLists.txt | 4 +- applications/rtkfdktwodweights/CMakeLists.txt | 4 +- applications/rtkfieldofview/CMakeLists.txt | 4 +- .../rtkforwardprojections/CMakeLists.txt | 4 +- .../rtkfourdconjugategradient/CMakeLists.txt | 4 +- applications/rtkfourdfdk/CMakeLists.txt | 4 +- applications/rtkfourdrooster/CMakeLists.txt | 4 +- .../rtkfourdrooster/rtkfourdrooster.cxx | 14 +- applications/rtkfourdsart/CMakeLists.txt | 4 +- applications/rtkfourdsart/rtkfourdsart.cxx | 2 +- applications/rtkgaincorrection/CMakeLists.txt | 4 +- .../rtkgaincorrection/rtkgaincorrection.ggo | 4 +- applications/rtki0estimation/CMakeLists.txt | 4 +- applications/rtkimagxgeometry/CMakeLists.txt | 4 +- .../rtkimagxgeometry/rtkimagxgeometry.cxx | 2 +- applications/rtkiterativefdk/CMakeLists.txt | 4 +- applications/rtklagcorrection/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../rtklastdimensionl0gradientdenoising.cxx | 2 +- applications/rtklut/CMakeLists.txt | 4 +- .../rtkmaskcollimation/CMakeLists.txt | 2 +- applications/rtkmcrooster/CMakeLists.txt | 4 +- applications/rtkmcrooster/rtkmcrooster.cxx | 10 +- .../CMakeLists.txt | 4 +- ...otioncompensatedfourdconjugategradient.cxx | 6 +- applications/rtkorageometry/CMakeLists.txt | 4 +- applications/rtkosem/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- .../rtkprojectgeometricphantom/CMakeLists.txt | 4 +- .../rtkprojectionmatrix/CMakeLists.txt | 4 +- applications/rtkprojections/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- applications/rtkramp/CMakeLists.txt | 4 +- .../rtkrayboxintersection/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../rtkrayquadricintersection/CMakeLists.txt | 4 +- applications/rtksart/CMakeLists.txt | 4 +- .../rtkscatterglarecorrection/CMakeLists.txt | 4 +- .../rtksimulatedgeometry/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../rtkspectralforwardmodel/CMakeLists.txt | 4 +- .../rtkspectralonestep/CMakeLists.txt | 4 +- .../rtkspectralrooster/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- applications/rtksubselect/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../rtktotalnuclearvariationdenoising.cxx | 4 +- .../rtktotalvariationdenoising/CMakeLists.txt | 4 +- .../rtktotalvariationdenoising.cxx | 4 +- .../rtktutorialapplication/CMakeLists.txt | 4 +- .../rtkvarianobigeometry/CMakeLists.txt | 4 +- .../rtkvarianprobeamgeometry/CMakeLists.txt | 4 +- .../rtkvectorconjugategradient/CMakeLists.txt | 4 +- .../rtkvectorconjugategradient.cxx | 2 +- .../rtkvectorconjugategradient.ggo | 2 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 2 +- .../rtkwarpedbackprojectsequence.cxx | 4 +- .../CMakeLists.txt | 4 +- .../rtkwarpedforwardprojectsequence.cxx | 2 +- .../rtkwaveletsdenoising/CMakeLists.txt | 4 +- applications/rtkxradgeometry/CMakeLists.txt | 4 +- cmake/FindCUDA_wrap.cmake | 6 +- cmake/FindRTK.cmake | 10 +- cmake/GetGitRevisionDescription.cmake.in | 2 +- cmake/has_cuda_gpu.cxx | 2 +- documentation/Doxygen/CMakeLists.txt | 4 +- documentation/Doxygen/MainPage.dox | 2 +- documentation/Doxygen/itkdoxygen.pl.in | 2 +- documentation/Doxygen/itkgroup.pl | 2 +- documentation/Doxygen/vxl_doxy.pl | 2 +- examples/CMakeLists.txt | 2 +- examples/FirstReconstruction/CMakeLists.txt | 2 +- ...talVariationConeBeamReconstructionFilter.h | 14 +- ...lVariationConeBeamReconstructionFilter.hxx | 14 +- ...MTotalVariationConjugateGradientOperator.h | 14 +- ...otalVariationConjugateGradientOperator.hxx | 14 +- ...ADMMWaveletsConeBeamReconstructionFilter.h | 2 +- ...rtkADMMWaveletsConjugateGradientOperator.h | 4 +- ...kADMMWaveletsConjugateGradientOperator.hxx | 2 +- ...kBackwardDifferenceDivergenceImageFilter.h | 6 +- ...teGradientConeBeamReconstructionFilter.hxx | 4 +- ...onjugateGradientGetX_kPlusOneImageFilter.h | 4 +- include/rtkConjugateGradientImageFilter.h | 4 +- include/rtkConjugateGradientOperator.h | 2 +- include/rtkConstantImageSource.hxx | 4 +- .../rtkCudaWarpForwardProjectionImageFilter.h | 6 +- include/rtkDownsampleImageFilter.h | 12 +- include/rtkDownsampleImageFilter.hxx | 10 +- include/rtkDualEnergyNegativeLogLikelihood.h | 2 +- include/rtkElektaSynergyGeometryReader.h | 4 +- .../rtkElektaSynergyLookupTableImageFilter.h | 2 +- .../rtkFDKConeBeamReconstructionFilter.hxx | 2 +- include/rtkFFTRampImageFilter.h | 16 +- .../rtkForwardDifferenceGradientImageFilter.h | 6 +- ...urDROOSTERConeBeamReconstructionFilter.hxx | 56 ++-- ...kFourDSARTConeBeamReconstructionFilter.hxx | 8 +- include/rtkGgoFunctions.h | 2 +- include/rtkImagXGeometryReader.h | 12 +- include/rtkImagXGeometryReader.hxx | 4 +- ...nterpolatorWithKnownWeightsImageFilter.hxx | 2 +- ...ephBackAttenuatedProjectionImageFilter.hxx | 2 +- include/rtkJosephBackProjectionImageFilter.h | 2 +- include/rtkLaplacianImageFilter.h | 8 +- include/rtkLaplacianImageFilter.hxx | 10 +- ...imensionL0GradientDenoisingImageFilter.hxx | 30 +- include/rtkMagnitudeThresholdImageFilter.h | 4 +- ...chlemOneStepSpectralReconstructionFilter.h | 6 +- include/rtkOraLookupTableImageFilter.h | 2 +- .../rtkProjectionStackToFourDImageFilter.hxx | 2 +- ...RegionConstIteratorRayBasedWithFlatPanel.h | 2 +- .../rtkSchlomka2008NegativeLogLikelihood.h | 2 +- ...draticSurrogateRegularizationImageFilter.h | 2 +- include/rtkSoftThresholdImageFilter.h | 10 +- ...DCircularProjectionGeometryXMLFileWriter.h | 2 +- ...NuclearVariationDenoisingBPDQImageFilter.h | 2 +- ...tkTotalVariationDenoisingBPDQImageFilter.h | 2 +- ...nwarpSequenceConjugateGradientOperator.hxx | 2 +- include/rtkUnwarpSequenceImageFilter.h | 6 +- include/rtkUnwarpSequenceImageFilter.hxx | 8 +- include/rtkUpsampleImageFilter.h | 12 +- include/rtkUpsampleImageFilter.hxx | 6 +- include/rtkVarianObiGeometryReader.h | 2 +- include/rtkVarianObiRawImageFilter.h | 10 +- itk-module-init.cmake | 2 +- src/rtkCudaLagCorrectionImageFilter.cu | 8 +- ...udaLastDimensionTVDenoisingImageFilter.cxx | 4 +- ...CudaPolynomialGainCorrectionImageFilter.cu | 8 +- ...udaPolynomialGainCorrectionImageFilter.cxx | 6 +- ...rtkCudaWarpForwardProjectionImageFilter.cu | 2 +- src/rtkElektaSynergyGeometryReader.cxx | 4 +- src/rtkGeometricPhantomFileReader.cxx | 2 +- ...ircularProjectionGeometryXMLFileReader.cxx | 2 +- ...ircularProjectionGeometryXMLFileWriter.cxx | 2 +- src/rtkXimImageIO.cxx | 4 +- test/CMakeLists.txt | 2 +- test/rtkadjointoperatorstest.cxx | 2 +- test/rtkadmmtotalvariationtest.cxx | 4 +- test/rtkadmmwaveletstest.cxx | 4 +- test/rtkcheckimagequality.cxx | 4 +- test/rtkcroptest.cxx | 20 +- test/rtkcudaraycastadjointoperatorstest.cxx | 8 +- test/rtkforwardprojectiontest.cxx | 2 +- test/rtkfourdadjointoperatorstest.cxx | 4 +- test/rtkfourdroostertest.cxx | 16 +- test/rtkfovtest.cxx | 4 +- test/rtkgaincorrectiontest.cxx | 18 +- test/rtkheadertestfooter.cxx | 2 +- test/rtkinterpolatesplatadjointtest.cxx | 2 +- test/rtklaplaciantest.cxx | 8 +- test/rtkrampfiltertest2.cxx | 20 +- test/rtkscatterglarefiltertest.cxx | 6 +- test/rtktotalvariationtest.cxx | 18 +- .../include/itkCudaContextManager.h | 2 +- .../include/itkCudaDataManager.h | 2 +- .../include/itkCudaImageDataManager.h | 2 +- .../include/itkCudaImageDataManager.hxx | 2 +- .../include/itkCudaKernelManager.h | 24 +- .../ITKCudaCommon/include/itkCudaReduction.h | 2 +- utilities/ITKCudaCommon/include/itkCudaUtil.h | 2 +- .../include/itkCudaWin32Header.h | 2 +- .../src/itkCudaKernelManager.cxx | 24 +- .../ITKCudaCommon/test/itkCudaImageTest.cxx | 10 +- utilities/UploadTestData.py | 4 +- utilities/gengetopt/CMakeLists.txt | 2 +- utilities/gengetopt/Makefile.am | 26 +- utilities/gengetopt/acceptedvalues.h | 2 +- utilities/gengetopt/argsdef.c | 22 +- utilities/gengetopt/argsdef.h | 22 +- utilities/gengetopt/cmdline.c | 296 +++++++++--------- utilities/gengetopt/cmdline.ggo | 2 +- utilities/gengetopt/cmdline.h | 4 +- utilities/gengetopt/errorcodes.h | 2 +- utilities/gengetopt/ggos.h | 2 +- utilities/gengetopt/global_opts.h | 22 +- utilities/gengetopt/gm.h | 8 +- utilities/gengetopt/groups.h | 22 +- utilities/gengetopt/parser.cc | 12 +- utilities/gengetopt/parser.h | 10 +- utilities/gengetopt/parser.yy | 2 +- utilities/gengetopt/scanner.cc | 102 +++--- utilities/gengetopt/skels/c_source.cc | 6 +- utilities/gengetopt/skels/c_source.h | 6 +- utilities/gengetopt/skels/check_modes.cc | 2 +- utilities/gengetopt/skels/check_modes.h | 6 +- utilities/gengetopt/skels/clear_arg.cc | 2 +- utilities/gengetopt/skels/clear_arg.h | 6 +- utilities/gengetopt/skels/clear_given.cc | 2 +- utilities/gengetopt/skels/clear_given.h | 6 +- utilities/gengetopt/skels/copyright.cc | 2 +- utilities/gengetopt/skels/copyright.h | 6 +- .../gengetopt/skels/custom_getopt_gen.cc | 2 +- utilities/gengetopt/skels/custom_getopt_gen.h | 6 +- utilities/gengetopt/skels/dependant_option.cc | 2 +- utilities/gengetopt/skels/dependant_option.h | 6 +- utilities/gengetopt/skels/enum_decl.cc | 2 +- utilities/gengetopt/skels/enum_decl.h | 6 +- utilities/gengetopt/skels/exit_failure.cc | 2 +- utilities/gengetopt/skels/exit_failure.h | 6 +- utilities/gengetopt/skels/file_save.cc | 2 +- utilities/gengetopt/skels/file_save.h | 6 +- .../gengetopt/skels/file_save_multiple.cc | 2 +- .../gengetopt/skels/file_save_multiple.h | 6 +- utilities/gengetopt/skels/free_list.cc | 2 +- utilities/gengetopt/skels/free_list.h | 6 +- utilities/gengetopt/skels/free_multiple.cc | 2 +- utilities/gengetopt/skels/free_multiple.h | 6 +- utilities/gengetopt/skels/free_string.cc | 2 +- utilities/gengetopt/skels/free_string.h | 6 +- utilities/gengetopt/skels/generic_option.cc | 2 +- utilities/gengetopt/skels/generic_option.h | 6 +- utilities/gengetopt/skels/given_field.cc | 2 +- utilities/gengetopt/skels/given_field.h | 6 +- utilities/gengetopt/skels/group_counter.cc | 2 +- utilities/gengetopt/skels/group_counter.h | 6 +- utilities/gengetopt/skels/group_option.cc | 2 +- utilities/gengetopt/skels/group_option.h | 6 +- utilities/gengetopt/skels/handle_help.cc | 2 +- utilities/gengetopt/skels/handle_help.h | 6 +- utilities/gengetopt/skels/handle_version.cc | 2 +- utilities/gengetopt/skels/handle_version.h | 6 +- utilities/gengetopt/skels/header.cc | 2 +- utilities/gengetopt/skels/header.h | 6 +- utilities/gengetopt/skels/init_args_info.cc | 2 +- utilities/gengetopt/skels/init_args_info.h | 6 +- .../gengetopt/skels/multiple_fill_array.cc | 2 +- .../gengetopt/skels/multiple_fill_array.h | 6 +- .../gengetopt/skels/multiple_opt_list.cc | 2 +- utilities/gengetopt/skels/multiple_opt_list.h | 6 +- utilities/gengetopt/skels/option_arg.cc | 2 +- utilities/gengetopt/skels/option_arg.h | 6 +- .../gengetopt/skels/print_help_string.cc | 2 +- utilities/gengetopt/skels/print_help_string.h | 6 +- utilities/gengetopt/skels/required_option.cc | 2 +- utilities/gengetopt/skels/required_option.h | 6 +- utilities/gengetopt/skels/reset_group.cc | 2 +- utilities/gengetopt/skels/reset_group.h | 6 +- utilities/gengetopt/skels/update_given.cc | 2 +- utilities/gengetopt/skels/update_given.h | 6 +- .../bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt | 2 +- .../bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt | 4 +- .../bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt | 20 +- .../lp_solve/bfp/bfp_LUSOL/LUSOL/lusol7a.c | 2 +- .../lp_solve/bfp/bfp_LUSOL/LUSOL/lusol8a.c | 2 +- utilities/lp_solve/bfp/lp_BFP1.c | 2 +- utilities/lp_solve/bfp/lp_BFP2.c | 2 +- utilities/lp_solve/colamd/colamd.c | 22 +- utilities/lp_solve/lp_MDO.c | 38 +-- utilities/lp_solve/lp_SOS.h | 2 +- utilities/lp_solve/lp_lib.c | 2 +- utilities/lp_solve/lp_matrix.h | 6 +- utilities/lp_solve/lp_presolve.c | 4 +- utilities/lp_solve/lp_rlp.h | 58 ++-- utilities/lp_solve/shared/myblas.c | 18 +- wrapping/itkCudaImageToImageFilter.wrap | 2 +- wrapping/itkVectorImageRTK.wrap | 2 +- wrapping/rtkBackProjectionImageFilter.wrap | 2 +- wrapping/rtkDisplacedDetectorImageFilter.wrap | 4 +- wrapping/rtkFDKWeightProjectionFilter.wrap | 2 +- ...IterativeConeBeamReconstructionFilter.wrap | 2 +- wrapping/rtkLookupTableImageFilter.wrap | 2 +- wrapping/rtkParkerShortScanImageFilter.wrap | 2 +- wrapping/rtkProjectionsReader.wrap | 6 +- .../rtkSplatWithKnownWeightsImageFilter.wrap | 2 +- wrapping/rtkVarianObiRawImageFilter.wrap | 6 +- 285 files changed, 1004 insertions(+), 1004 deletions(-) diff --git a/COPYRIGHT.TXT b/COPYRIGHT.TXT index 5ef0669bd..e8a06be20 100644 --- a/COPYRIGHT.TXT +++ b/COPYRIGHT.TXT @@ -125,7 +125,7 @@ distribute or use the Software. rights expressly granted hereunder. ------------------------------------------------------------------------ -gengetopt code has been taken from git://git.sv.gnu.org/gengetopt.git +gengetopt code has been taken from git://git.sv.gnu.org/gengetopt.git tag rel_2_22_4 @@ -173,12 +173,12 @@ Some code is modified (a lot) from GIFT, the Generalized Image Fusion Toolkit ------------------------------------------------------------------------ Some code is modified from http://sourceforge.net/projects/niftyrec/: -- tt_project_ray_gpu_kernels.cu in rtkCudaForwardProjectionImageFilter.h +- tt_project_ray_gpu_kernels.cu in rtkCudaForwardProjectionImageFilter.h - NIFTYREC TOMOGRAPHY TOOLBOX + NIFTYREC TOMOGRAPHY TOOLBOX -Copyright (c) 2009-2013, University College London, United-Kingdom. -All rights reserved. +Copyright (c) 2009-2013, University College London, United-Kingdom. +All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -191,7 +191,7 @@ and/or other materials provided with the distribution. Neither the name of the University College London nor the names of its contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/README.rst b/README.rst index 8b6947516..77ac3a43a 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -RTK: The Reconstruction ToolKit +RTK: The Reconstruction ToolKit ------------------------------- .. image:: https://circleci.com/gh/SimonRit/RTK/tree/master.svg?style=shield diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index bdd1bd6c5..0cd9904c8 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -4,7 +4,7 @@ find_package(Gengetopt) # Common revision info between applications include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) -if(GIT_SHA1 MATCHES ".*NOTFOUND") +if(GIT_SHA1 MATCHES ".*NOTFOUND") set(RTK_VERSION_HASH "") else() set(RTK_VERSION_HASH ", git hash ${GIT_SHA1}") @@ -118,7 +118,7 @@ if(BUILD_TESTING) add_test(rtkappfdkchecktest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtkcheckimagequality fdk_gpu.mha) set_tests_properties(rtkappfdkchecktest PROPERTIES DEPENDS rtkappfdkcudatest) else() - # Only run the software version if + # Only run the software version if if(NOT FAST_TESTS_NO_CHECKS) add_test(rtkappfdktest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtkfdk -g geo -p . -r sheppy.mha -o fdk_gpu.mha) set_tests_properties(rtkappfdktest PROPERTIES DEPENDS rtkappprojectshepploganphantomtest) @@ -127,5 +127,5 @@ if(BUILD_TESTING) set_tests_properties(rtkappfdkchecktest PROPERTIES DEPENDS rtkappfdktest) endif() endif() - + endif() diff --git a/applications/rtkadmmtotalvariation/CMakeLists.txt b/applications/rtkadmmtotalvariation/CMakeLists.txt index 437e9788c..c84ca1573 100644 --- a/applications/rtkadmmtotalvariation/CMakeLists.txt +++ b/applications/rtkadmmtotalvariation/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkadmmtotalvariation RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkadmmtotalvariation) + foreach(EXE_NAME rtkadmmtotalvariation) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkadmmtotalvariation/rtkadmmtotalvariation.cxx b/applications/rtkadmmtotalvariation/rtkadmmtotalvariation.cxx index d6ea7b0ec..09eae45c8 100644 --- a/applications/rtkadmmtotalvariation/rtkadmmtotalvariation.cxx +++ b/applications/rtkadmmtotalvariation/rtkadmmtotalvariation.cxx @@ -38,11 +38,11 @@ int main(int argc, char * argv[]) #ifdef RTK_USE_CUDA typedef itk::CudaImage< OutputPixelType, Dimension > OutputImageType; - typedef itk::CudaImage< itk::CovariantVector + typedef itk::CudaImage< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #else typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #endif diff --git a/applications/rtkadmmwavelets/CMakeLists.txt b/applications/rtkadmmwavelets/CMakeLists.txt index ea6925a6d..92ca138ec 100644 --- a/applications/rtkadmmwavelets/CMakeLists.txt +++ b/applications/rtkadmmwavelets/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkadmmwavelets RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkadmmwavelets) + foreach(EXE_NAME rtkadmmwavelets) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkadmmwavelets/rtkadmmwavelets.cxx b/applications/rtkadmmwavelets/rtkadmmwavelets.cxx index 6b886f0e8..cc161bf28 100644 --- a/applications/rtkadmmwavelets/rtkadmmwavelets.cxx +++ b/applications/rtkadmmwavelets/rtkadmmwavelets.cxx @@ -115,7 +115,7 @@ int main(int argc, char * argv[]) // Set the inputs of the ADMM filter admmFilter->SetInput(0, inputFilter->GetOutput() ); admmFilter->SetInput(1, projectionsReader->GetOutput() ); - + admmFilter->SetDisableDisplacedDetectorFilter(args_info.nodisplaced_flag); TRY_AND_EXIT_ON_ITK_EXCEPTION( admmFilter->Update() ) diff --git a/applications/rtkamsterdamshroud/CMakeLists.txt b/applications/rtkamsterdamshroud/CMakeLists.txt index b7b8e1ee4..ab4c1716b 100644 --- a/applications/rtkamsterdamshroud/CMakeLists.txt +++ b/applications/rtkamsterdamshroud/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkamsterdamshroud RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkamsterdamshroud) + foreach(EXE_NAME rtkamsterdamshroud) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkbackprojections/CMakeLists.txt b/applications/rtkbackprojections/CMakeLists.txt index 2d20b532e..d061ee468 100644 --- a/applications/rtkbackprojections/CMakeLists.txt +++ b/applications/rtkbackprojections/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkbackprojections RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkbackprojections) + foreach(EXE_NAME rtkbackprojections) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkbioscangeometry/CMakeLists.txt b/applications/rtkbioscangeometry/CMakeLists.txt index bf4c5b6d4..b8dcacbb8 100644 --- a/applications/rtkbioscangeometry/CMakeLists.txt +++ b/applications/rtkbioscangeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkbioscangeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkbioscangeometry) + foreach(EXE_NAME rtkbioscangeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkconjugategradient/CMakeLists.txt b/applications/rtkconjugategradient/CMakeLists.txt index 549d9118b..fff99f668 100644 --- a/applications/rtkconjugategradient/CMakeLists.txt +++ b/applications/rtkconjugategradient/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkconjugategradient RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkconjugategradient) + foreach(EXE_NAME rtkconjugategradient) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkconjugategradient/rtkconjugategradient.cxx b/applications/rtkconjugategradient/rtkconjugategradient.cxx index 9e28ad66c..c101b1b22 100644 --- a/applications/rtkconjugategradient/rtkconjugategradient.cxx +++ b/applications/rtkconjugategradient/rtkconjugategradient.cxx @@ -95,7 +95,7 @@ int main(int argc, char * argv[]) { typedef rtk::ConstantImageSource< OutputImageType > ConstantWeightsSourceType; ConstantWeightsSourceType::Pointer constantWeightsSource = ConstantWeightsSourceType::New(); - + // Set the weights to be like the projections TRY_AND_EXIT_ON_ITK_EXCEPTION( reader->UpdateOutputInformation() ) constantWeightsSource->SetInformationFromImage(reader->GetOutput()); diff --git a/applications/rtkdigisensgeometry/CMakeLists.txt b/applications/rtkdigisensgeometry/CMakeLists.txt index 58f7870a2..2d254a81e 100644 --- a/applications/rtkdigisensgeometry/CMakeLists.txt +++ b/applications/rtkdigisensgeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkdigisensgeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkdigisensgeometry) + foreach(EXE_NAME rtkdigisensgeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkdrawgeometricphantom/CMakeLists.txt b/applications/rtkdrawgeometricphantom/CMakeLists.txt index 10ea9a475..3495d8edc 100644 --- a/applications/rtkdrawgeometricphantom/CMakeLists.txt +++ b/applications/rtkdrawgeometricphantom/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkdrawgeometricphantom RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkdrawgeometricphantom) + foreach(EXE_NAME rtkdrawgeometricphantom) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkdrawshepploganphantom/CMakeLists.txt b/applications/rtkdrawshepploganphantom/CMakeLists.txt index a1d40aa91..5f99b33eb 100644 --- a/applications/rtkdrawshepploganphantom/CMakeLists.txt +++ b/applications/rtkdrawshepploganphantom/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkdrawshepploganphantom RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkdrawshepploganphantom) + foreach(EXE_NAME rtkdrawshepploganphantom) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkdualenergyforwardmodel/CMakeLists.txt b/applications/rtkdualenergyforwardmodel/CMakeLists.txt index 046921d01..796e28754 100644 --- a/applications/rtkdualenergyforwardmodel/CMakeLists.txt +++ b/applications/rtkdualenergyforwardmodel/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtkdualenergyforwardmodel RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkdualenergyforwardmodel) + foreach(EXE_NAME rtkdualenergyforwardmodel) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkdualenergysimplexdecomposition/CMakeLists.txt b/applications/rtkdualenergysimplexdecomposition/CMakeLists.txt index 4c5341887..c231359a6 100644 --- a/applications/rtkdualenergysimplexdecomposition/CMakeLists.txt +++ b/applications/rtkdualenergysimplexdecomposition/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtkdualenergysimplexdecomposition RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkdualenergysimplexdecomposition) + foreach(EXE_NAME rtkdualenergysimplexdecomposition) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkelektasynergygeometry/CMakeLists.txt b/applications/rtkelektasynergygeometry/CMakeLists.txt index 896458232..56af56ec3 100644 --- a/applications/rtkelektasynergygeometry/CMakeLists.txt +++ b/applications/rtkelektasynergygeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkelektasynergygeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkelektasynergygeometry) + foreach(EXE_NAME rtkelektasynergygeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkextractphasesignal/CMakeLists.txt b/applications/rtkextractphasesignal/CMakeLists.txt index 2638b44ff..b18123241 100644 --- a/applications/rtkextractphasesignal/CMakeLists.txt +++ b/applications/rtkextractphasesignal/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkextractphasesignal RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkextractphasesignal) + foreach(EXE_NAME rtkextractphasesignal) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkextractshroudsignal/CMakeLists.txt b/applications/rtkextractshroudsignal/CMakeLists.txt index 105923872..80c399d71 100644 --- a/applications/rtkextractshroudsignal/CMakeLists.txt +++ b/applications/rtkextractshroudsignal/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkextractshroudsignal RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkextractshroudsignal) + foreach(EXE_NAME rtkextractshroudsignal) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfdk/CMakeLists.txt b/applications/rtkfdk/CMakeLists.txt index 022d45c54..3deab44dd 100644 --- a/applications/rtkfdk/CMakeLists.txt +++ b/applications/rtkfdk/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfdk RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfdk) + foreach(EXE_NAME rtkfdk) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfdktwodweights/CMakeLists.txt b/applications/rtkfdktwodweights/CMakeLists.txt index 1a156bb50..03e63db04 100644 --- a/applications/rtkfdktwodweights/CMakeLists.txt +++ b/applications/rtkfdktwodweights/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfdktwodweights RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfdktwodweights) + foreach(EXE_NAME rtkfdktwodweights) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfieldofview/CMakeLists.txt b/applications/rtkfieldofview/CMakeLists.txt index 66592cca5..59bc79b1f 100644 --- a/applications/rtkfieldofview/CMakeLists.txt +++ b/applications/rtkfieldofview/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfieldofview RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfieldofview) + foreach(EXE_NAME rtkfieldofview) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkforwardprojections/CMakeLists.txt b/applications/rtkforwardprojections/CMakeLists.txt index 9dbbcebd7..4ba9a51fb 100644 --- a/applications/rtkforwardprojections/CMakeLists.txt +++ b/applications/rtkforwardprojections/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkforwardprojections RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkforwardprojections) + foreach(EXE_NAME rtkforwardprojections) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfourdconjugategradient/CMakeLists.txt b/applications/rtkfourdconjugategradient/CMakeLists.txt index 53c84092e..9e96a4c36 100644 --- a/applications/rtkfourdconjugategradient/CMakeLists.txt +++ b/applications/rtkfourdconjugategradient/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfourdconjugategradient RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfourdconjugategradient) + foreach(EXE_NAME rtkfourdconjugategradient) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfourdfdk/CMakeLists.txt b/applications/rtkfourdfdk/CMakeLists.txt index b770b352d..04b7ac00f 100644 --- a/applications/rtkfourdfdk/CMakeLists.txt +++ b/applications/rtkfourdfdk/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfourdfdk RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfourdfdk) + foreach(EXE_NAME rtkfourdfdk) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfourdrooster/CMakeLists.txt b/applications/rtkfourdrooster/CMakeLists.txt index 17edbd4f9..c4fd9a5a5 100644 --- a/applications/rtkfourdrooster/CMakeLists.txt +++ b/applications/rtkfourdrooster/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfourdrooster RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfourdrooster) + foreach(EXE_NAME rtkfourdrooster) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfourdrooster/rtkfourdrooster.cxx b/applications/rtkfourdrooster/rtkfourdrooster.cxx index 866657b37..7386c4b2c 100644 --- a/applications/rtkfourdrooster/rtkfourdrooster.cxx +++ b/applications/rtkfourdrooster/rtkfourdrooster.cxx @@ -113,7 +113,7 @@ int main(int argc, char * argv[]) signalToInterpolationWeights->SetSignal(reorder->GetOutputSignal()); signalToInterpolationWeights->SetNumberOfReconstructedFrames(inputFilter->GetOutput()->GetLargestPossibleRegion().GetSize(3)); TRY_AND_EXIT_ON_ITK_EXCEPTION( signalToInterpolationWeights->Update() ) - + // Create the 4DROOSTER filter, connect the basic inputs, and set the basic parameters // Also set the forward and back projection filters to be used typedef rtk::FourDROOSTERConeBeamReconstructionFilter ROOSTERFilterType; @@ -127,7 +127,7 @@ int main(int argc, char * argv[]) rooster->SetCudaConjugateGradient(args_info.cudacg_flag); rooster->SetUseCudaCyclicDeformation(args_info.cudadvfinterpolation_flag); rooster->SetDisableDisplacedDetectorFilter(args_info.nodisplaced_flag); - + // Set the newly ordered arguments rooster->SetInputProjectionStack( reorder->GetOutput() ); rooster->SetGeometry( reorder->GetOutputGeometry() ); @@ -136,13 +136,13 @@ int main(int argc, char * argv[]) // For each optional regularization step, set whether or not // it should be performed, and provide the necessary inputs - + // Positivity if (args_info.nopositivity_flag) rooster->SetPerformPositivity(false); else rooster->SetPerformPositivity(true); - + // Motion mask typedef itk::ImageFileReader< VolumeType > InputReaderType; if (args_info.motionmask_given) @@ -155,7 +155,7 @@ int main(int argc, char * argv[]) } else rooster->SetPerformMotionMask(false); - + // Spatial TV if (args_info.gamma_space_given) { @@ -165,7 +165,7 @@ int main(int argc, char * argv[]) } else rooster->SetPerformTVSpatialDenoising(false); - + // Spatial wavelets if (args_info.threshold_given) { @@ -176,7 +176,7 @@ int main(int argc, char * argv[]) } else rooster->SetPerformWaveletsSpatialDenoising(false); - + // Temporal TV if (args_info.gamma_time_given) { diff --git a/applications/rtkfourdsart/CMakeLists.txt b/applications/rtkfourdsart/CMakeLists.txt index b3578b092..7ae25931b 100644 --- a/applications/rtkfourdsart/CMakeLists.txt +++ b/applications/rtkfourdsart/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkfourdsart RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkfourdsart) + foreach(EXE_NAME rtkfourdsart) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkfourdsart/rtkfourdsart.cxx b/applications/rtkfourdsart/rtkfourdsart.cxx index 6168d14dd..633ef8d6d 100644 --- a/applications/rtkfourdsart/rtkfourdsart.cxx +++ b/applications/rtkfourdsart/rtkfourdsart.cxx @@ -96,7 +96,7 @@ int main(int argc, char * argv[]) phaseReader->SetFileName(args_info.signal_arg); phaseReader->SetNumberOfReconstructedFrames(inputFilter->GetOutput()->GetLargestPossibleRegion().GetSize(3)); TRY_AND_EXIT_ON_ITK_EXCEPTION( phaseReader->Update() ) - + // 4D SART reconstruction filter rtk::FourDSARTConeBeamReconstructionFilter< VolumeSeriesType, ProjectionStackType >::Pointer fourdsart = rtk::FourDSARTConeBeamReconstructionFilter< VolumeSeriesType, ProjectionStackType >::New(); diff --git a/applications/rtkgaincorrection/CMakeLists.txt b/applications/rtkgaincorrection/CMakeLists.txt index 0b867ab65..b3e3f5335 100644 --- a/applications/rtkgaincorrection/CMakeLists.txt +++ b/applications/rtkgaincorrection/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtkgaincorrection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkgaincorrection) + foreach(EXE_NAME rtkgaincorrection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkgaincorrection/rtkgaincorrection.ggo b/applications/rtkgaincorrection/rtkgaincorrection.ggo index 103f7a10f..f6aba0322 100644 --- a/applications/rtkgaincorrection/rtkgaincorrection.ggo +++ b/applications/rtkgaincorrection/rtkgaincorrection.ggo @@ -7,7 +7,7 @@ option "output" o "Output file name" section "Filter parameters" option "calibDir" c "Directory containing the calibration files" string yes -option "Gain" - "Gain maps filename" string yes -option "Dark" - "Offset map filename" string yes +option "Gain" - "Gain maps filename" string yes +option "Dark" - "Offset map filename" string yes option "K" - "Normalization coefficient" float yes default="1.0" option "bufferSize" - "Number of projections computed at the same time" int no default="4" diff --git a/applications/rtki0estimation/CMakeLists.txt b/applications/rtki0estimation/CMakeLists.txt index f95d1ab30..be599d337 100644 --- a/applications/rtki0estimation/CMakeLists.txt +++ b/applications/rtki0estimation/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtki0estimation RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtki0estimation) + foreach(EXE_NAME rtki0estimation) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkimagxgeometry/CMakeLists.txt b/applications/rtkimagxgeometry/CMakeLists.txt index 9350ede01..664b4127c 100644 --- a/applications/rtkimagxgeometry/CMakeLists.txt +++ b/applications/rtkimagxgeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkimagxgeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkimagxgeometry) + foreach(EXE_NAME rtkimagxgeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkimagxgeometry/rtkimagxgeometry.cxx b/applications/rtkimagxgeometry/rtkimagxgeometry.cxx index 6c2b5147b..9caa06891 100644 --- a/applications/rtkimagxgeometry/rtkimagxgeometry.cxx +++ b/applications/rtkimagxgeometry/rtkimagxgeometry.cxx @@ -40,7 +40,7 @@ int main(int argc, char * argv[]) imagxReader->SetRoomXMLFileName(args_info.room_setup_arg); } TRY_AND_EXIT_ON_ITK_EXCEPTION( imagxReader->UpdateOutputData() ) - + // Write rtk::ThreeDCircularProjectionGeometryXMLFileWriter::Pointer xmlWriter = rtk::ThreeDCircularProjectionGeometryXMLFileWriter::New(); xmlWriter->SetFilename(args_info.output_arg); diff --git a/applications/rtkiterativefdk/CMakeLists.txt b/applications/rtkiterativefdk/CMakeLists.txt index 1c39d2f3c..472bd9707 100644 --- a/applications/rtkiterativefdk/CMakeLists.txt +++ b/applications/rtkiterativefdk/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkiterativefdk RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkiterativefdk) + foreach(EXE_NAME rtkiterativefdk) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtklagcorrection/CMakeLists.txt b/applications/rtklagcorrection/CMakeLists.txt index 17233781f..c69a9f62c 100644 --- a/applications/rtklagcorrection/CMakeLists.txt +++ b/applications/rtklagcorrection/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtklagcorrection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtklagcorrection) + foreach(EXE_NAME rtklagcorrection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtklastdimensionl0gradientdenoising/CMakeLists.txt b/applications/rtklastdimensionl0gradientdenoising/CMakeLists.txt index 4becd35bf..df0a5cf7e 100644 --- a/applications/rtklastdimensionl0gradientdenoising/CMakeLists.txt +++ b/applications/rtklastdimensionl0gradientdenoising/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtklastdimensionl0gradientdenoising RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtklastdimensionl0gradientdenoising) + foreach(EXE_NAME rtklastdimensionl0gradientdenoising) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtklastdimensionl0gradientdenoising/rtklastdimensionl0gradientdenoising.cxx b/applications/rtklastdimensionl0gradientdenoising/rtklastdimensionl0gradientdenoising.cxx index ced36af62..b0770ed9b 100644 --- a/applications/rtklastdimensionl0gradientdenoising/rtklastdimensionl0gradientdenoising.cxx +++ b/applications/rtklastdimensionl0gradientdenoising/rtklastdimensionl0gradientdenoising.cxx @@ -43,7 +43,7 @@ int main(int argc, char * argv[]) typedef itk::Image< OutputPixelType, Dimension > OutputImageType; typedef rtk::LastDimensionL0GradientDenoisingImageFilter DenoisingFilterType; // #endif - + // Read input typedef itk::ImageFileReader ReaderType; ReaderType::Pointer reader = ReaderType::New(); diff --git a/applications/rtklut/CMakeLists.txt b/applications/rtklut/CMakeLists.txt index ef6963feb..c3c16b071 100644 --- a/applications/rtklut/CMakeLists.txt +++ b/applications/rtklut/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtklut RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtklut) + foreach(EXE_NAME rtklut) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkmaskcollimation/CMakeLists.txt b/applications/rtkmaskcollimation/CMakeLists.txt index 679d96e31..8836922b7 100644 --- a/applications/rtkmaskcollimation/CMakeLists.txt +++ b/applications/rtkmaskcollimation/CMakeLists.txt @@ -9,6 +9,6 @@ if(NOT RTK_INSTALL_NO_EXECUTABLES) RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkmcrooster/CMakeLists.txt b/applications/rtkmcrooster/CMakeLists.txt index ffbe5a7ca..39fd385a7 100644 --- a/applications/rtkmcrooster/CMakeLists.txt +++ b/applications/rtkmcrooster/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkmcrooster RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkmcrooster) + foreach(EXE_NAME rtkmcrooster) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkmcrooster/rtkmcrooster.cxx b/applications/rtkmcrooster/rtkmcrooster.cxx index 98f448372..c5e877989 100644 --- a/applications/rtkmcrooster/rtkmcrooster.cxx +++ b/applications/rtkmcrooster/rtkmcrooster.cxx @@ -137,13 +137,13 @@ int main(int argc, char * argv[]) // For each optional regularization step, set whether or not // it should be performed, and provide the necessary inputs - + // Positivity if (args_info.nopositivity_flag) mcrooster->SetPerformPositivity(false); else mcrooster->SetPerformPositivity(true); - + // Motion mask typedef itk::ImageFileReader< VolumeType > InputReaderType; if (args_info.motionmask_given) @@ -156,7 +156,7 @@ int main(int argc, char * argv[]) } else mcrooster->SetPerformMotionMask(false); - + // Spatial TV if (args_info.gamma_space_given) { @@ -166,7 +166,7 @@ int main(int argc, char * argv[]) } else mcrooster->SetPerformTVSpatialDenoising(false); - + // Spatial wavelets if (args_info.threshold_given) { @@ -177,7 +177,7 @@ int main(int argc, char * argv[]) } else mcrooster->SetPerformWaveletsSpatialDenoising(false); - + // Temporal TV if (args_info.gamma_time_given) { diff --git a/applications/rtkmotioncompensatedfourdconjugategradient/CMakeLists.txt b/applications/rtkmotioncompensatedfourdconjugategradient/CMakeLists.txt index 0aa76edd6..980875c96 100644 --- a/applications/rtkmotioncompensatedfourdconjugategradient/CMakeLists.txt +++ b/applications/rtkmotioncompensatedfourdconjugategradient/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkmotioncompensatedfourdconjugategradient RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkmotioncompensatedfourdconjugategradient) + foreach(EXE_NAME rtkmotioncompensatedfourdconjugategradient) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkmotioncompensatedfourdconjugategradient/rtkmotioncompensatedfourdconjugategradient.cxx b/applications/rtkmotioncompensatedfourdconjugategradient/rtkmotioncompensatedfourdconjugategradient.cxx index 6002bb4b8..6661d6b1d 100644 --- a/applications/rtkmotioncompensatedfourdconjugategradient/rtkmotioncompensatedfourdconjugategradient.cxx +++ b/applications/rtkmotioncompensatedfourdconjugategradient/rtkmotioncompensatedfourdconjugategradient.cxx @@ -100,8 +100,8 @@ int main(int argc, char * argv[]) phaseReader->SetFileName(args_info.signal_arg); phaseReader->SetNumberOfReconstructedFrames(inputFilter->GetOutput()->GetLargestPossibleRegion().GetSize(3)); TRY_AND_EXIT_ON_ITK_EXCEPTION( phaseReader->Update() ) - - + + // Create the mcfourdcg filter, connect the basic inputs, and set the basic parameters typedef rtk::MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter MCFourDCGFilterType; MCFourDCGFilterType::Pointer mcfourdcg = MCFourDCGFilterType::New(); @@ -113,7 +113,7 @@ int main(int argc, char * argv[]) mcfourdcg->SetCudaConjugateGradient(args_info.cudacg_flag); mcfourdcg->SetSignal(rtk::ReadSignalFile(args_info.signal_arg)); mcfourdcg->SetDisableDisplacedDetectorFilter(args_info.nodisplaced_flag); - + // Read DVF DVFReaderType::Pointer dvfReader = DVFReaderType::New(); dvfReader->SetFileName( args_info.dvf_arg ); diff --git a/applications/rtkorageometry/CMakeLists.txt b/applications/rtkorageometry/CMakeLists.txt index b378662c1..225c17395 100644 --- a/applications/rtkorageometry/CMakeLists.txt +++ b/applications/rtkorageometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkorageometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkorageometry) + foreach(EXE_NAME rtkorageometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkosem/CMakeLists.txt b/applications/rtkosem/CMakeLists.txt index bfb39bb62..fe6fc22c5 100644 --- a/applications/rtkosem/CMakeLists.txt +++ b/applications/rtkosem/CMakeLists.txt @@ -9,6 +9,6 @@ if(NOT RTK_INSTALL_NO_EXECUTABLES) RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkparkershortscanweighting/CMakeLists.txt b/applications/rtkparkershortscanweighting/CMakeLists.txt index f8d41eaec..9f917ed06 100644 --- a/applications/rtkparkershortscanweighting/CMakeLists.txt +++ b/applications/rtkparkershortscanweighting/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkparkershortscanweighting RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkparkershortscanweighting) + foreach(EXE_NAME rtkparkershortscanweighting) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkprojectgeometricphantom/CMakeLists.txt b/applications/rtkprojectgeometricphantom/CMakeLists.txt index abb0f0653..2c59ca850 100644 --- a/applications/rtkprojectgeometricphantom/CMakeLists.txt +++ b/applications/rtkprojectgeometricphantom/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkprojectgeometricphantom RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkprojectgeometricphantom) + foreach(EXE_NAME rtkprojectgeometricphantom) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkprojectionmatrix/CMakeLists.txt b/applications/rtkprojectionmatrix/CMakeLists.txt index 5fde507a3..de11df641 100644 --- a/applications/rtkprojectionmatrix/CMakeLists.txt +++ b/applications/rtkprojectionmatrix/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkprojectionmatrix RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkprojectionmatrix) + foreach(EXE_NAME rtkprojectionmatrix) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkprojections/CMakeLists.txt b/applications/rtkprojections/CMakeLists.txt index 6751aff38..f27312552 100644 --- a/applications/rtkprojections/CMakeLists.txt +++ b/applications/rtkprojections/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkprojections RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkprojections) + foreach(EXE_NAME rtkprojections) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkprojectshepploganphantom/CMakeLists.txt b/applications/rtkprojectshepploganphantom/CMakeLists.txt index 46425e447..d6128b20e 100644 --- a/applications/rtkprojectshepploganphantom/CMakeLists.txt +++ b/applications/rtkprojectshepploganphantom/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkprojectshepploganphantom RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkprojectshepploganphantom) + foreach(EXE_NAME rtkprojectshepploganphantom) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkramp/CMakeLists.txt b/applications/rtkramp/CMakeLists.txt index d60ed3aa3..641023ff0 100644 --- a/applications/rtkramp/CMakeLists.txt +++ b/applications/rtkramp/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkramp RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkramp) + foreach(EXE_NAME rtkramp) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkrayboxintersection/CMakeLists.txt b/applications/rtkrayboxintersection/CMakeLists.txt index 9abc95874..28e0509c8 100644 --- a/applications/rtkrayboxintersection/CMakeLists.txt +++ b/applications/rtkrayboxintersection/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkrayboxintersection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkrayboxintersection) + foreach(EXE_NAME rtkrayboxintersection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkrayellipsoidintersection/CMakeLists.txt b/applications/rtkrayellipsoidintersection/CMakeLists.txt index 693064d4c..ce1046f1e 100644 --- a/applications/rtkrayellipsoidintersection/CMakeLists.txt +++ b/applications/rtkrayellipsoidintersection/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkrayellipsoidintersection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkrayellipsoidintersection) + foreach(EXE_NAME rtkrayellipsoidintersection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkrayquadricintersection/CMakeLists.txt b/applications/rtkrayquadricintersection/CMakeLists.txt index 13eaf912a..c8a6cf1fd 100644 --- a/applications/rtkrayquadricintersection/CMakeLists.txt +++ b/applications/rtkrayquadricintersection/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkrayquadricintersection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkrayquadricintersection) + foreach(EXE_NAME rtkrayquadricintersection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtksart/CMakeLists.txt b/applications/rtksart/CMakeLists.txt index 3a43ca1d5..22d1cc05a 100644 --- a/applications/rtksart/CMakeLists.txt +++ b/applications/rtksart/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtksart RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtksart) + foreach(EXE_NAME rtksart) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkscatterglarecorrection/CMakeLists.txt b/applications/rtkscatterglarecorrection/CMakeLists.txt index fd5403456..7b9b0ff74 100644 --- a/applications/rtkscatterglarecorrection/CMakeLists.txt +++ b/applications/rtkscatterglarecorrection/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkscatterglarecorrection RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkscatterglarecorrection) + foreach(EXE_NAME rtkscatterglarecorrection) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtksimulatedgeometry/CMakeLists.txt b/applications/rtksimulatedgeometry/CMakeLists.txt index 8ca7b3048..ddea10316 100644 --- a/applications/rtksimulatedgeometry/CMakeLists.txt +++ b/applications/rtksimulatedgeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtksimulatedgeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtksimulatedgeometry) + foreach(EXE_NAME rtksimulatedgeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkspectraldenoiseprojections/CMakeLists.txt b/applications/rtkspectraldenoiseprojections/CMakeLists.txt index 3204d5376..7988ad009 100644 --- a/applications/rtkspectraldenoiseprojections/CMakeLists.txt +++ b/applications/rtkspectraldenoiseprojections/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkspectraldenoiseprojections RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkspectraldenoiseprojections) + foreach(EXE_NAME rtkspectraldenoiseprojections) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkspectralforwardmodel/CMakeLists.txt b/applications/rtkspectralforwardmodel/CMakeLists.txt index 1ad43cad8..b95200a9c 100644 --- a/applications/rtkspectralforwardmodel/CMakeLists.txt +++ b/applications/rtkspectralforwardmodel/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtkspectralforwardmodel RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkspectralforwardmodel) + foreach(EXE_NAME rtkspectralforwardmodel) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkspectralonestep/CMakeLists.txt b/applications/rtkspectralonestep/CMakeLists.txt index 9db304ba6..d80191d93 100644 --- a/applications/rtkspectralonestep/CMakeLists.txt +++ b/applications/rtkspectralonestep/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkspectralonestep RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkspectralonestep) + foreach(EXE_NAME rtkspectralonestep) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkspectralrooster/CMakeLists.txt b/applications/rtkspectralrooster/CMakeLists.txt index de67156f9..487f4feb3 100644 --- a/applications/rtkspectralrooster/CMakeLists.txt +++ b/applications/rtkspectralrooster/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkspectralrooster RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkspectralrooster) + foreach(EXE_NAME rtkspectralrooster) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkspectralsimplexdecomposition/CMakeLists.txt b/applications/rtkspectralsimplexdecomposition/CMakeLists.txt index f0c1745bb..2cae6a033 100644 --- a/applications/rtkspectralsimplexdecomposition/CMakeLists.txt +++ b/applications/rtkspectralsimplexdecomposition/CMakeLists.txt @@ -4,10 +4,10 @@ target_link_libraries(rtkspectralsimplexdecomposition RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkspectralsimplexdecomposition) + foreach(EXE_NAME rtkspectralsimplexdecomposition) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtksubselect/CMakeLists.txt b/applications/rtksubselect/CMakeLists.txt index 39ec47732..5d554910f 100644 --- a/applications/rtksubselect/CMakeLists.txt +++ b/applications/rtksubselect/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtksubselect RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtksubselect) + foreach(EXE_NAME rtksubselect) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt b/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt index 96632da63..31f233605 100644 --- a/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt +++ b/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtktotalnuclearvariationdenoising RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtktotalnuclearvariationdenoising) + foreach(EXE_NAME rtktotalnuclearvariationdenoising) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtktotalnuclearvariationdenoising/rtktotalnuclearvariationdenoising.cxx b/applications/rtktotalnuclearvariationdenoising/rtktotalnuclearvariationdenoising.cxx index f0a49e1fa..be1b9af0c 100644 --- a/applications/rtktotalnuclearvariationdenoising/rtktotalnuclearvariationdenoising.cxx +++ b/applications/rtktotalnuclearvariationdenoising/rtktotalnuclearvariationdenoising.cxx @@ -35,11 +35,11 @@ int main(int argc, char * argv[]) const unsigned int DimensionsProcessed = 3; // Number of dimensions along which the gradient is computed typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, DimensionsProcessed >, Dimension > GradientOutputImageType; typedef rtk::TotalNuclearVariationDenoisingBPDQImageFilter TVDenoisingFilterType; - + // Read input typedef itk::ImageFileReader ReaderType; ReaderType::Pointer reader = ReaderType::New(); diff --git a/applications/rtktotalvariationdenoising/CMakeLists.txt b/applications/rtktotalvariationdenoising/CMakeLists.txt index fcdfc1a98..f4e3a2954 100644 --- a/applications/rtktotalvariationdenoising/CMakeLists.txt +++ b/applications/rtktotalvariationdenoising/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtktotalvariationdenoising RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtktotalvariationdenoising) + foreach(EXE_NAME rtktotalvariationdenoising) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtktotalvariationdenoising/rtktotalvariationdenoising.cxx b/applications/rtktotalvariationdenoising/rtktotalvariationdenoising.cxx index de572a293..f4825894a 100644 --- a/applications/rtktotalvariationdenoising/rtktotalvariationdenoising.cxx +++ b/applications/rtktotalvariationdenoising/rtktotalvariationdenoising.cxx @@ -45,12 +45,12 @@ int main(int argc, char * argv[]) typedef rtk::CudaTotalVariationDenoisingBPDQImageFilter TVDenoisingFilterType; #else typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; typedef rtk::TotalVariationDenoisingBPDQImageFilter TVDenoisingFilterType; #endif - + // Read input typedef itk::ImageFileReader ReaderType; ReaderType::Pointer reader = ReaderType::New(); diff --git a/applications/rtktutorialapplication/CMakeLists.txt b/applications/rtktutorialapplication/CMakeLists.txt index fdcba14f5..ad617cb93 100644 --- a/applications/rtktutorialapplication/CMakeLists.txt +++ b/applications/rtktutorialapplication/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtktutorialapplication RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtktutorialapplication) + foreach(EXE_NAME rtktutorialapplication) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkvarianobigeometry/CMakeLists.txt b/applications/rtkvarianobigeometry/CMakeLists.txt index fc8815b0c..2d47ffa12 100644 --- a/applications/rtkvarianobigeometry/CMakeLists.txt +++ b/applications/rtkvarianobigeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkvarianobigeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkvarianobigeometry) + foreach(EXE_NAME rtkvarianobigeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkvarianprobeamgeometry/CMakeLists.txt b/applications/rtkvarianprobeamgeometry/CMakeLists.txt index ca779f06d..185b96973 100644 --- a/applications/rtkvarianprobeamgeometry/CMakeLists.txt +++ b/applications/rtkvarianprobeamgeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkvarianprobeamgeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkvarianprobeamgeometry) + foreach(EXE_NAME rtkvarianprobeamgeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkvectorconjugategradient/CMakeLists.txt b/applications/rtkvectorconjugategradient/CMakeLists.txt index 65bbf106f..f6c7307fa 100644 --- a/applications/rtkvectorconjugategradient/CMakeLists.txt +++ b/applications/rtkvectorconjugategradient/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkvectorconjugategradient RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkvectorconjugategradient) + foreach(EXE_NAME rtkvectorconjugategradient) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.cxx b/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.cxx index fac10fb10..7bf47eadf 100644 --- a/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.cxx +++ b/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.cxx @@ -105,7 +105,7 @@ int main(int argc, char * argv[]) { typedef rtk::ConstantImageSource< WeightsImageType > ConstantWeightsSourceType; ConstantWeightsSourceType::Pointer constantWeightsSource = ConstantWeightsSourceType::New(); - + // Set the weights to the identity matrix TRY_AND_EXIT_ON_ITK_EXCEPTION( reader->UpdateOutputInformation() ) constantWeightsSource->SetInformationFromImage(reader->GetOutput()); diff --git a/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.ggo b/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.ggo index 0b7c91f11..6755cfe76 100644 --- a/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.ggo +++ b/applications/rtkvectorconjugategradient/rtkvectorconjugategradient.ggo @@ -7,7 +7,7 @@ option "geometry" g "XML geometry file name" option "output" o "Output file name" string yes option "projections" - "Projections file name" string yes option "niterations" n "Number of iterations" int no default="5" -option "time" t "Records elapsed time during the process" flag off +option "time" t "Records elapsed time during the process" flag off option "input" i "Input volume" string no option "weights" w "Weights file for Weighted Least Squares (WLS)" string no option "tikhonov" - "Tikhonov regularization weight" float no default="0" diff --git a/applications/rtkwangdisplaceddetectorweighting/CMakeLists.txt b/applications/rtkwangdisplaceddetectorweighting/CMakeLists.txt index c26cd7a00..98cb5a1aa 100644 --- a/applications/rtkwangdisplaceddetectorweighting/CMakeLists.txt +++ b/applications/rtkwangdisplaceddetectorweighting/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkwangdisplaceddetectorweighting RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkwangdisplaceddetectorweighting) + foreach(EXE_NAME rtkwangdisplaceddetectorweighting) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkwarpedbackprojectsequence/CMakeLists.txt b/applications/rtkwarpedbackprojectsequence/CMakeLists.txt index a8a7be5a3..c335c1025 100644 --- a/applications/rtkwarpedbackprojectsequence/CMakeLists.txt +++ b/applications/rtkwarpedbackprojectsequence/CMakeLists.txt @@ -9,6 +9,6 @@ if(NOT RTK_INSTALL_NO_EXECUTABLES) RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkwarpedbackprojectsequence/rtkwarpedbackprojectsequence.cxx b/applications/rtkwarpedbackprojectsequence/rtkwarpedbackprojectsequence.cxx index d7d3cb56d..8a78413ab 100644 --- a/applications/rtkwarpedbackprojectsequence/rtkwarpedbackprojectsequence.cxx +++ b/applications/rtkwarpedbackprojectsequence/rtkwarpedbackprojectsequence.cxx @@ -97,8 +97,8 @@ int main(int argc, char * argv[]) rtk::PhasesToInterpolationWeights::Pointer phaseReader = rtk::PhasesToInterpolationWeights::New(); phaseReader->SetFileName(args_info.signal_arg); phaseReader->SetNumberOfReconstructedFrames(inputFilter->GetOutput()->GetLargestPossibleRegion().GetSize(3)); - phaseReader->Update(); - + phaseReader->Update(); + // Create the main filter, connect the basic inputs, and set the basic parameters typedef rtk::WarpProjectionStackToFourDImageFilter WarpForwardProjectSequenceFilterType; diff --git a/applications/rtkwarpedforwardprojectsequence/CMakeLists.txt b/applications/rtkwarpedforwardprojectsequence/CMakeLists.txt index a00408b88..91893c41b 100644 --- a/applications/rtkwarpedforwardprojectsequence/CMakeLists.txt +++ b/applications/rtkwarpedforwardprojectsequence/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkwarpedforwardprojectsequence RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkwarpedforwardprojectsequence) + foreach(EXE_NAME rtkwarpedforwardprojectsequence) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkwarpedforwardprojectsequence/rtkwarpedforwardprojectsequence.cxx b/applications/rtkwarpedforwardprojectsequence/rtkwarpedforwardprojectsequence.cxx index 86a236598..18002106d 100644 --- a/applications/rtkwarpedforwardprojectsequence/rtkwarpedforwardprojectsequence.cxx +++ b/applications/rtkwarpedforwardprojectsequence/rtkwarpedforwardprojectsequence.cxx @@ -75,7 +75,7 @@ int main(int argc, char * argv[]) phaseReader->SetFileName(args_info.signal_arg); phaseReader->SetNumberOfReconstructedFrames(volumeSeriesReader->GetOutput()->GetLargestPossibleRegion().GetSize(3)); TRY_AND_EXIT_ON_ITK_EXCEPTION( phaseReader->Update() ) - + // Read DVF DVFReaderType::Pointer dvfReader = DVFReaderType::New(); dvfReader->SetFileName( args_info.dvf_arg ); diff --git a/applications/rtkwaveletsdenoising/CMakeLists.txt b/applications/rtkwaveletsdenoising/CMakeLists.txt index 8321b9bb5..2420c3ca2 100644 --- a/applications/rtkwaveletsdenoising/CMakeLists.txt +++ b/applications/rtkwaveletsdenoising/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkwaveletsdenoising RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkwaveletsdenoising) + foreach(EXE_NAME rtkwaveletsdenoising) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/applications/rtkxradgeometry/CMakeLists.txt b/applications/rtkxradgeometry/CMakeLists.txt index 3dbed6e86..9fe04a2ed 100644 --- a/applications/rtkxradgeometry/CMakeLists.txt +++ b/applications/rtkxradgeometry/CMakeLists.txt @@ -4,11 +4,11 @@ target_link_libraries(rtkxradgeometry RTK) # Installation code if(NOT RTK_INSTALL_NO_EXECUTABLES) - foreach(EXE_NAME rtkxradgeometry) + foreach(EXE_NAME rtkxradgeometry) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${RTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime LIBRARY DESTINATION ${RTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${RTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endforeach() + endforeach() endif() diff --git a/cmake/FindCUDA_wrap.cmake b/cmake/FindCUDA_wrap.cmake index e3cb5a190..67d3a5038 100644 --- a/cmake/FindCUDA_wrap.cmake +++ b/cmake/FindCUDA_wrap.cmake @@ -13,7 +13,7 @@ else () set (CUDA_PROPAGATE_HOST_FLAGS CACHE BOOL OFF) endif () - # GCS 2012-05-11: We need to propagate cxx flags to nvcc, but + # GCS 2012-05-11: We need to propagate cxx flags to nvcc, but # the flag -ftest-coverage causes nvcc to barf, so exclude that one if (CMAKE_COMPILER_IS_GNUCC) string (REPLACE "-ftest-coverage" "" TMP "${CMAKE_CXX_FLAGS}") @@ -74,9 +74,9 @@ endif() if(CUDA_FOUND) try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR - ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/has_cuda_gpu.cxx - CMAKE_FLAGS + CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${CUDA_TOOLKIT_INCLUDE} -DLINK_LIBRARIES:STRING=${CUDA_CUDART_LIBRARY} COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT_VAR diff --git a/cmake/FindRTK.cmake b/cmake/FindRTK.cmake index ba89cf24b..d83730735 100644 --- a/cmake/FindRTK.cmake +++ b/cmake/FindRTK.cmake @@ -7,12 +7,12 @@ # that can be included to set the include directories, library directories, # and preprocessor macros. In addition to the variables read from # RTKConfig.cmake, this find module also defines -# RTK_DIR - The directory containing RTKConfig.cmake. -# This is either the root of the build tree, -# or the lib/InsightToolkit directory. +# RTK_DIR - The directory containing RTKConfig.cmake. +# This is either the root of the build tree, +# or the lib/InsightToolkit directory. # This is the only cache entry. -# -# RTK_FOUND - Whether RTK was found. If this is true, +# +# RTK_FOUND - Whether RTK was found. If this is true, # RTK_DIR is okay. # diff --git a/cmake/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in index 888ce13aa..6faa374a8 100644 --- a/cmake/GetGitRevisionDescription.cmake.in +++ b/cmake/GetGitRevisionDescription.cmake.in @@ -1,4 +1,4 @@ -# +# # Internal file for GetGitRevisionDescription.cmake # # Requires CMake 2.6 or newer (uses the 'function' command) diff --git a/cmake/has_cuda_gpu.cxx b/cmake/has_cuda_gpu.cxx index 16faa1bee..03265e0f4 100644 --- a/cmake/has_cuda_gpu.cxx +++ b/cmake/has_cuda_gpu.cxx @@ -6,7 +6,7 @@ int main() { int gpuDeviceCount = 0; struct cudaDeviceProp properties; cudaError_t cudaResultCode = cudaGetDeviceCount(&deviceCount); - if (cudaResultCode != cudaSuccess) + if (cudaResultCode != cudaSuccess) deviceCount = 0; /* machines with no GPUs can still report one emulation device */ for (device = 0; device < deviceCount; ++device) { diff --git a/documentation/Doxygen/CMakeLists.txt b/documentation/Doxygen/CMakeLists.txt index 5f03b90a8..066bf646e 100644 --- a/documentation/Doxygen/CMakeLists.txt +++ b/documentation/Doxygen/CMakeLists.txt @@ -31,7 +31,7 @@ if (RTK_BUILD_DOXYGEN) if(EXISTS ${ITK_DOXYGEN_COMPRESSED_TAG_FILE}) find_program(GZIP_TOOL NAMES gzip) if(GZIP_TOOL) - execute_process(COMMAND ${GZIP_TOOL} -dkf ${ITK_DOXYGEN_COMPRESSED_TAG_FILE}) + execute_process(COMMAND ${GZIP_TOOL} -dkf ${ITK_DOXYGEN_COMPRESSED_TAG_FILE}) set(DOXYGEN_TAGFILES_PARAMETER "${ITK_DOXYGEN_TAG_FILE}=http://www.itk.org/Doxygen/html/") endif() else() @@ -44,7 +44,7 @@ if (RTK_BUILD_DOXYGEN) configure_file(${PROJECT_SOURCE_DIR}/documentation/Doxygen/itkdoxygen.pl.in ${PROJECT_BINARY_DIR}/Doxygen/itkdoxygen.pl) - add_custom_target(Documentation + add_custom_target(Documentation COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxygen/doxygen.config MAIN_DEPENDENCY ${PROJECT_BINARY_DIR}/Doxygen/doxygen.config DEPENDS ${PROJECT_BINARY_DIR}/Doxygen/itkdoxygen.pl ${LATEXTARGETS} diff --git a/documentation/Doxygen/MainPage.dox b/documentation/Doxygen/MainPage.dox index bc36f9614..1e44f73f7 100644 --- a/documentation/Doxygen/MainPage.dox +++ b/documentation/Doxygen/MainPage.dox @@ -12,7 +12,7 @@ * * This documentation describes the API of the Toolkit. The Modules * link presents a hierarchy of classes organized according to their - * functionality. + * functionality. * */ diff --git a/documentation/Doxygen/itkdoxygen.pl.in b/documentation/Doxygen/itkdoxygen.pl.in index 60983b362..6548d0182 100644 --- a/documentation/Doxygen/itkdoxygen.pl.in +++ b/documentation/Doxygen/itkdoxygen.pl.in @@ -1,5 +1,5 @@ # for vxl files run the vxl_doxy.pl script, and use itkgroup.pl for all other files -if ( $ARGV[0] =~ /(vxl|vcl|vnl)/) +if ( $ARGV[0] =~ /(vxl|vcl|vnl)/) { system ("perl @RTK_SOURCE_DIR@/documentation/Doxygen/vxl_doxy.pl $ARGV[0]"); } diff --git a/documentation/Doxygen/itkgroup.pl b/documentation/Doxygen/itkgroup.pl index f5276d3f7..9d90fdf8c 100644 --- a/documentation/Doxygen/itkgroup.pl +++ b/documentation/Doxygen/itkgroup.pl @@ -16,7 +16,7 @@ { # I guess it was not a group, dump savebuffer if($ingroup) - { + { print "/**" . $savebuffer . "\n"; } # if it is a class or brief then output the line but diff --git a/documentation/Doxygen/vxl_doxy.pl b/documentation/Doxygen/vxl_doxy.pl index f3590259f..87458fe68 100644 --- a/documentation/Doxygen/vxl_doxy.pl +++ b/documentation/Doxygen/vxl_doxy.pl @@ -6,7 +6,7 @@ # If Windows barfs at line 3 here, you will need to run perl -x vxl_doxy.pl # You can set up as a permanent file association using the following commands # >assoc .pl-PerlScript -# >ftype PerlScript=Perl=C:\Perl\bin\Perl.exe -x "%1" %* +# >ftype PerlScript=Perl=C:\Perl\bin\Perl.exe -x "%1" %* # Script to change the perceps documentation format to Doxygen (JavaDoc) format # Authors: diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2ecad4331..779457413 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory(FirstReconstruction) if(BUILD_TESTING) add_test(HelloWorldTest ${EXECUTABLE_OUTPUT_PATH}/HelloWorld) set_tests_properties (HelloWorldTest - PROPERTIES + PROPERTIES PASS_REGULAR_EXPRESSION "RTK Hello World!" ) diff --git a/examples/FirstReconstruction/CMakeLists.txt b/examples/FirstReconstruction/CMakeLists.txt index 4c45442e1..5d6d1dd4e 100644 --- a/examples/FirstReconstruction/CMakeLists.txt +++ b/examples/FirstReconstruction/CMakeLists.txt @@ -6,7 +6,7 @@ project(FirstReconstruction) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) include(${ITK_USE_FILE}) - + # Executable(s) add_executable(FirstReconstruction FirstReconstruction.cxx ) target_link_libraries(FirstReconstruction ${RTK_LIBRARIES}) diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h index d274eeeab..ba43b76f8 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h @@ -44,7 +44,7 @@ namespace rtk * D the displaced detector weighting matrix, and TV the total variation. * Details on the method and the calculations can be found on page 48 of * - * Mory, C. “Cardiac C-Arm Computed Tomography”, PhD thesis, 2014. + * Mory, C. "Cardiac C-Arm Computed Tomography", PhD thesis, 2014. * https://hal.inria.fr/tel-00985728/document * * \f$ f_{k+1} \f$ is obtained by linear conjugate solving the following: @@ -128,8 +128,8 @@ namespace rtk * \ingroup RTK ReconstructionAlgorithm */ -template< typename TOutputImage, typename TGradientOutputImage = - itk::Image< itk::CovariantVector < typename TOutputImage::ValueType, TOutputImage::ImageDimension >, +template< typename TOutputImage, typename TGradientOutputImage = + itk::Image< itk::CovariantVector < typename TOutputImage::ValueType, TOutputImage::ImageDimension >, TOutputImage::ImageDimension > > class ADMMTotalVariationConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { @@ -153,9 +153,9 @@ class ADMMTotalVariationConeBeamReconstructionFilter : public rtk::IterativeCone typedef rtk::BackProjectionImageFilter< TOutputImage, TOutputImage > BackProjectionFilterType; typedef typename BackProjectionFilterType::Pointer BackProjectionFilterPointer; typedef rtk::ConjugateGradientImageFilter ConjugateGradientFilterType; - typedef ForwardDifferenceGradientImageFilter ImageGradientFilterType; typedef rtk::BackwardDifferenceDivergenceImageFilter ImageDivergenceFilterType; @@ -214,7 +214,7 @@ class ADMMTotalVariationConeBeamReconstructionFilter : public rtk::IterativeCone typename MultiplyVolumeFilterType::Pointer m_MultiplyFilter; typename MultiplyVolumeFilterType::Pointer m_ZeroMultiplyVolumeFilter; typename MultiplyGradientFilterType::Pointer m_ZeroMultiplyGradientFilter; - typename ImageGradientFilterType::Pointer m_GradientFilter1; + typename ImageGradientFilterType::Pointer m_GradientFilter1; typename ImageGradientFilterType::Pointer m_GradientFilter2; typename SubtractVolumeFilterType::Pointer m_SubtractVolumeFilter; typename AddGradientsFilterType::Pointer m_AddGradientsFilter; diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx index 989b948b9..75dddbb9b 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx @@ -24,7 +24,7 @@ namespace rtk { -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> ADMMTotalVariationConeBeamReconstructionFilter ::ADMMTotalVariationConeBeamReconstructionFilter() { @@ -93,7 +93,7 @@ ADMMTotalVariationConeBeamReconstructionFilterReleaseDataFlagOn(); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::SetForwardProjectionFilter (ForwardProjectionType _arg) @@ -106,7 +106,7 @@ ADMMTotalVariationConeBeamReconstructionFilter +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::SetBackProjectionFilter (BackProjectionType _arg) @@ -120,7 +120,7 @@ ADMMTotalVariationConeBeamReconstructionFilter +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::SetBetaForCurrentIteration(int iter) @@ -141,7 +141,7 @@ ADMMTotalVariationConeBeamReconstructionFilter +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::GenerateInputRequestedRegion() @@ -163,7 +163,7 @@ ADMMTotalVariationConeBeamReconstructionFilterSetRequestedRegion( inputPtr1->GetLargestPossibleRegion() ); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::GenerateOutputInformation() @@ -212,7 +212,7 @@ ADMMTotalVariationConeBeamReconstructionFilterGetOutput()->CopyInformation( m_SubtractFilter2->GetOutput() ); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConeBeamReconstructionFilter ::GenerateData() diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 834a36003..514da4e9d 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -47,8 +47,8 @@ namespace rtk * Details on the method and the calculations can be found in * * Mory, C., B. Zhang, V. Auvray, M. Grass, D. Schafer, F. Peyrin, S. Rit, P. Douek, - * and L. Boussel. “ECG-Gated C-Arm Computed Tomography Using L1 Regularization.” - * In Proceedings of the 20th European Signal Processing Conference (EUSIPCO), 2728–32, 2012. + * and L. Boussel. "ECG-Gated C-Arm Computed Tomography Using L1 Regularization." + * In Proceedings of the 20th European Signal Processing Conference (EUSIPCO), 2728-32, 2012. * * This filter takes in input f and outputs R_t D R f - beta div(grad(f)). * @@ -99,8 +99,8 @@ namespace rtk * \ingroup RTK ReconstructionAlgorithm */ -template< typename TOutputImage, typename TGradientOutputImage = - itk::Image< itk::CovariantVector < typename TOutputImage::ValueType, TOutputImage::ImageDimension >, +template< typename TOutputImage, typename TGradientOutputImage = + itk::Image< itk::CovariantVector < typename TOutputImage::ValueType, TOutputImage::ImageDimension >, TOutputImage::ImageDimension > > class ADMMTotalVariationConjugateGradientOperator : public ConjugateGradientOperator< TOutputImage > { @@ -124,9 +124,9 @@ class ADMMTotalVariationConjugateGradientOperator : public ConjugateGradientOper typedef itk::MultiplyImageFilter MultiplyFilterType; typedef itk::SubtractImageFilter SubtractFilterType; - typedef ForwardDifferenceGradientImageFilter GradientFilterType; typedef rtk::BackwardDifferenceDivergenceImageFilter DivergenceFilterType; diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.hxx b/include/rtkADMMTotalVariationConjugateGradientOperator.hxx index a720982c9..64613d169 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.hxx +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.hxx @@ -24,7 +24,7 @@ namespace rtk { -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> ADMMTotalVariationConjugateGradientOperator ::ADMMTotalVariationConjugateGradientOperator() { @@ -64,7 +64,7 @@ ADMMTotalVariationConjugateGradientOperator m_SubtractFilter->ReleaseDataFlagOff(); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConjugateGradientOperator ::SetBackProjectionFilter (const typename BackProjectionFilterType::Pointer _arg) @@ -74,7 +74,7 @@ ADMMTotalVariationConjugateGradientOperator m_BackProjectionFilter = _arg; } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConjugateGradientOperator ::SetForwardProjectionFilter (const typename ForwardProjectionFilterType::Pointer _arg) @@ -94,7 +94,7 @@ ADMMTotalVariationConjugateGradientOperator this->Modified(); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConjugateGradientOperator ::GenerateInputRequestedRegion() @@ -112,7 +112,7 @@ ADMMTotalVariationConjugateGradientOperator inputPtr1->SetRequestedRegion( inputPtr1->GetLargestPossibleRegion() ); } -template< typename TOutputImage, typename TGradientOutputImage> +template< typename TOutputImage, typename TGradientOutputImage> void ADMMTotalVariationConjugateGradientOperator ::GenerateOutputInformation() @@ -161,8 +161,8 @@ ADMMTotalVariationConjugateGradientOperator this->GetOutput()->CopyInformation( m_SubtractFilter->GetOutput() ); } -template< typename TOutputImage, typename TGradientOutputImage> -void +template< typename TOutputImage, typename TGradientOutputImage> +void ADMMTotalVariationConjugateGradientOperator ::GenerateData() { diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h index 6f58f29bc..7a0ccf3f7 100644 --- a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h +++ b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h @@ -44,7 +44,7 @@ namespace rtk * \f$ W^{T} = W^{-1} \f$ * Details on the method and the calculations can be found on page 53 of * - * Mory, C. “Cardiac C-Arm Computed Tomography”, PhD thesis, 2014. + * Mory, C. "Cardiac C-Arm Computed Tomography", PhD thesis, 2014. * https://hal.inria.fr/tel-00985728/document * * \f$ f_{k+1} \f$ is obtained by linear conjugate solving the following: diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index 1397bf4d6..f26688112 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -44,8 +44,8 @@ namespace rtk * Details on the method and the calculations can be found in * * Mory, C., B. Zhang, V. Auvray, M. Grass, D. Schafer, F. Peyrin, S. Rit, P. Douek, - * and L. Boussel. “ECG-Gated C-Arm Computed Tomography Using L1 Regularization.” - * In Proceedings of the 20th European Signal Processing Conference (EUSIPCO), 2728–32, 2012. + * and L. Boussel. "ECG-Gated C-Arm Computed Tomography Using L1 Regularization." + * In Proceedings of the 20th European Signal Processing Conference (EUSIPCO), 2728-32, 2012. * * This filter takes in input f and outputs R_t R f + beta * W_t W f. The Daubechies * wavelets being orthogonal, W_t happens to be the inverse of W, and therefore diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.hxx b/include/rtkADMMWaveletsConjugateGradientOperator.hxx index 8e382c7cb..168dba865 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.hxx +++ b/include/rtkADMMWaveletsConjugateGradientOperator.hxx @@ -137,7 +137,7 @@ ADMMWaveletsConjugateGradientOperator } template< typename TOutputImage > -void +void ADMMWaveletsConjugateGradientOperator ::GenerateData() { diff --git a/include/rtkBackwardDifferenceDivergenceImageFilter.h b/include/rtkBackwardDifferenceDivergenceImageFilter.h index 32399e707..a9a50e88d 100644 --- a/include/rtkBackwardDifferenceDivergenceImageFilter.h +++ b/include/rtkBackwardDifferenceDivergenceImageFilter.h @@ -29,9 +29,9 @@ namespace rtk * (adjoint of the forward differences gradient) of the input image * * The exact definition of the desired divergence filter can - * be found in Chambolle, Antonin. “An Algorithm for Total - * Variation Minimization and Applications.” J. Math. Imaging Vis. 20, - * no. 1–2 (January 2004): 89–97. + * be found in Chambolle, Antonin. "An Algorithm for Total + * Variation Minimization and Applications." J. Math. Imaging Vis. 20, + * no. 1-2 (January 2004): 89-97. * * \ingroup RTK IntensityImageFilters */ diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx b/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx index 9a01f1f50..45b5cd280 100644 --- a/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx +++ b/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx @@ -267,7 +267,7 @@ ConjugateGradientConeBeamReconstructionFilterSetA(m_CGOperator.GetPointer()); m_ConjugateGradientFilter->SetIterationCosts(m_IterationCosts); - + // Set runtime connections m_ConstantVolumeSource->SetInformationFromImage(this->GetInputVolume()); m_CGOperator->SetInputProjectionStack(m_DisplacedDetectorFilter->GetOutput()); @@ -305,7 +305,7 @@ ConjugateGradientConeBeamReconstructionFilterSetGeometry(this->m_Geometry); m_BackProjectionFilterForB->SetGeometry(this->m_Geometry.GetPointer()); m_DisplacedDetectorFilter->SetGeometry(this->m_Geometry); - + // Set runtime parameters m_ConjugateGradientFilter->SetNumberOfIterations(this->m_NumberOfIterations); m_CGOperator->SetGamma(m_Gamma); diff --git a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h index e5ee21a84..2d1282329 100644 --- a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h @@ -35,7 +35,7 @@ template< typename TInputImage> class ConjugateGradientGetX_kPlusOneImageFilter : public itk::ImageToImageFilter< TInputImage, TInputImage> { public: - + /** Standard class typedefs. */ typedef ConjugateGradientGetX_kPlusOneImageFilter Self; typedef itk::ImageToImageFilter< TInputImage, TInputImage> Superclass; @@ -72,7 +72,7 @@ class ConjugateGradientGetX_kPlusOneImageFilter : public itk::ImageToImageFilter void GenerateData() ITK_OVERRIDE; void GenerateOutputInformation() ITK_OVERRIDE; - + private: ConjugateGradientGetX_kPlusOneImageFilter(const Self &); //purposely not implemented void operator=(const Self &); //purposely not implemented diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h index 75989be03..432b387b0 100644 --- a/include/rtkConjugateGradientImageFilter.h +++ b/include/rtkConjugateGradientImageFilter.h @@ -46,7 +46,7 @@ template< typename OutputImageType> class ConjugateGradientImageFilter : public itk::InPlaceImageFilter< OutputImageType, OutputImageType> { public: - + /** Standard class typedefs. */ typedef ConjugateGradientImageFilter Self; typedef itk::InPlaceImageFilter< OutputImageType, OutputImageType> Superclass; @@ -83,7 +83,7 @@ class ConjugateGradientImageFilter : public itk::InPlaceImageFilter< OutputImage /** Getter for ResidualCosts storing array **/ const std::vector &GetResidualCosts(); - + protected: ConjugateGradientImageFilter(); virtual ~ConjugateGradientImageFilter() ITK_OVERRIDE {} diff --git a/include/rtkConjugateGradientOperator.h b/include/rtkConjugateGradientOperator.h index 78a052a56..a5d071753 100644 --- a/include/rtkConjugateGradientOperator.h +++ b/include/rtkConjugateGradientOperator.h @@ -32,7 +32,7 @@ template< typename OutputImageType> class ConjugateGradientOperator : public itk::ImageToImageFilter< OutputImageType, OutputImageType> { public: - + /** Standard class typedefs. */ typedef ConjugateGradientOperator Self; typedef itk::ImageToImageFilter< OutputImageType, OutputImageType > Superclass; diff --git a/include/rtkConstantImageSource.hxx b/include/rtkConstantImageSource.hxx index 4c8da4acd..d1a02305d 100644 --- a/include/rtkConstantImageSource.hxx +++ b/include/rtkConstantImageSource.hxx @@ -140,7 +140,7 @@ ConstantImageSource //---------------------------------------------------------------------------- template -void +void ConstantImageSource ::GenerateOutputInformation() { @@ -159,7 +159,7 @@ ConstantImageSource //---------------------------------------------------------------------------- template -void +void ConstantImageSource #if ITK_VERSION_MAJOR<5 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, ThreadIdType itkNotUsed(threadId) ) diff --git a/include/rtkCudaWarpForwardProjectionImageFilter.h b/include/rtkCudaWarpForwardProjectionImageFilter.h index b0c5c3148..b7ff5a322 100644 --- a/include/rtkCudaWarpForwardProjectionImageFilter.h +++ b/include/rtkCudaWarpForwardProjectionImageFilter.h @@ -68,11 +68,11 @@ class RTK_EXPORT CudaWarpForwardProjectionImageFilter : /** Input projection stack */ void SetInputProjectionStack(const InputImageType* ProjectionStack); InputImageType::Pointer GetInputProjectionStack(); - + /** Input displacement vector field */ void SetInputVolume(const InputImageType* Volume); InputImageType::Pointer GetInputVolume(); - + /** Input displacement vector field */ void SetDisplacementField(const DVFType* DVF); DVFType::Pointer GetDisplacementField(); @@ -86,7 +86,7 @@ class RTK_EXPORT CudaWarpForwardProjectionImageFilter : ~CudaWarpForwardProjectionImageFilter() {}; virtual void GenerateInputRequestedRegion(); - + virtual void GPUGenerateData(); private: diff --git a/include/rtkDownsampleImageFilter.h b/include/rtkDownsampleImageFilter.h index c8fc897ce..872f6679d 100644 --- a/include/rtkDownsampleImageFilter.h +++ b/include/rtkDownsampleImageFilter.h @@ -29,7 +29,7 @@ namespace rtk * * This filter is inspired from Dan Mueller's GIFT package * http://www.insight-journal.org/browse/publication/103 - * + * * \author Cyril Mory * * \ingroup RTK @@ -46,7 +46,7 @@ class ITK_EXPORT DownsampleImageFilter: typedef itk::SmartPointer ConstPointer; /** Method for creation through the object factory. */ - itkNewMacro(Self); + itkNewMacro(Self); /** Run-time type information (and related methods). */ itkTypeMacro(DownsampleImageFilter, ImageToImageFilter); @@ -114,16 +114,16 @@ class ITK_EXPORT DownsampleImageFilter: private: DownsampleImageFilter(const Self&); //purposely not implemented void operator=(const Self&); //purposely not implemented - + unsigned int m_Factors[ImageDimension]; int m_Offsets[ImageDimension]; }; - + } // end namespace rtk - + #ifndef rtk_MANUAL_INSTANTIATION #include "rtkDownsampleImageFilter.hxx" #endif - + #endif diff --git a/include/rtkDownsampleImageFilter.hxx b/include/rtkDownsampleImageFilter.hxx index 678e2c5c4..012ae9495 100644 --- a/include/rtkDownsampleImageFilter.hxx +++ b/include/rtkDownsampleImageFilter.hxx @@ -95,7 +95,7 @@ DownsampleImageFilter * */ template -void +void DownsampleImageFilter #if ITK_VERSION_MAJOR<5 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId)) @@ -217,11 +217,11 @@ DownsampleImageFilter // std::cout << "In DownsampleImageFilter : AfterThreadedGenerateData" << std::endl; //} -/** +/** * */ template -void +void DownsampleImageFilter ::GenerateInputRequestedRegion() { @@ -239,11 +239,11 @@ DownsampleImageFilter inputPtr->SetRequestedRegionToLargestPossibleRegion(); } -/** +/** * */ template -void +void DownsampleImageFilter ::GenerateOutputInformation() { diff --git a/include/rtkDualEnergyNegativeLogLikelihood.h b/include/rtkDualEnergyNegativeLogLikelihood.h index 0977aac7d..8079b467e 100644 --- a/include/rtkDualEnergyNegativeLogLikelihood.h +++ b/include/rtkDualEnergyNegativeLogLikelihood.h @@ -107,7 +107,7 @@ class DualEnergyNegativeLogLikelihood : public rtk::ProjectionsDecompositionNega long double measure = 0; // TODO: Improve this estimation // We assume that the variance of the integrated energy is equal to the mean - // From equation (5) of "Cramér–Rao lower bound of basis image noise in multiple-energy x-ray imaging", + // From equation (5) of "Cramer-Rao lower bound of basis image noise in multiple-energy x-ray imaging", // PMB 2009, Roessl et al, we replace the variance with the mean // Compute the negative log likelihood from the expectedEnergies diff --git a/include/rtkElektaSynergyGeometryReader.h b/include/rtkElektaSynergyGeometryReader.h index dafe59e0f..a4c09a540 100644 --- a/include/rtkElektaSynergyGeometryReader.h +++ b/include/rtkElektaSynergyGeometryReader.h @@ -28,7 +28,7 @@ namespace rtk /** \class ElektaSynergyGeometryReader * - * Creates a 3D circular geometry from the Elekta database input. + * Creates a 3D circular geometry from the Elekta database input. * * \test rtkelektatest.cxx * @@ -91,7 +91,7 @@ class RTK_EXPORT ElektaSynergyGeometryReader : GeometryType::Pointer m_Geometry; std::string m_DicomUID; std::string m_ImageDbfFileName; - std::string m_FrameDbfFileName; + std::string m_FrameDbfFileName; }; } diff --git a/include/rtkElektaSynergyLookupTableImageFilter.h b/include/rtkElektaSynergyLookupTableImageFilter.h index 6f627e225..b1f1027ff 100644 --- a/include/rtkElektaSynergyLookupTableImageFilter.h +++ b/include/rtkElektaSynergyLookupTableImageFilter.h @@ -47,7 +47,7 @@ class ITK_EXPORT ElektaSynergyLookupTableImageFilter: public: /** Standard class typedefs. */ typedef ElektaSynergyLookupTableImageFilter Self; - typedef LookupTableImageFilter, TOutputImage> Superclass; typedef itk::SmartPointer Pointer; diff --git a/include/rtkFDKConeBeamReconstructionFilter.hxx b/include/rtkFDKConeBeamReconstructionFilter.hxx index 5487a2628..2e2f39e49 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.hxx +++ b/include/rtkFDKConeBeamReconstructionFilter.hxx @@ -91,7 +91,7 @@ FDKConeBeamReconstructionFilter unsigned int firstStackSize = std::min(m_ProjectionSubsetSize, (unsigned int)projRegion.GetSize(Dimension-1) ); projRegion.SetSize(Dimension-1, firstStackSize); m_ExtractFilter->SetExtractionRegion(projRegion); - + // Run composite filter update m_BackProjectionFilter->SetInput ( 0, this->GetInput(0) ); m_BackProjectionFilter->SetInPlace( this->GetInPlace() ); diff --git a/include/rtkFFTRampImageFilter.h b/include/rtkFFTRampImageFilter.h index dddd5e7ff..0cb9a7eae 100644 --- a/include/rtkFFTRampImageFilter.h +++ b/include/rtkFFTRampImageFilter.h @@ -107,24 +107,24 @@ class ITK_EXPORT FFTRampImageFilter : /** Set/Get the Ram-Lak window frequency (0...1). 0 (default) disable it. * Equation and further explanation about Ram-Lak filter could be found in: - * 1. Fundamentals of 2D and 3D reconstruction (by Dr. Günter Lauritsch). + * 1. Fundamentals of 2D and 3D reconstruction (by Dr. Gunter Lauritsch). * http://campar.in.tum.de/twiki/pub/Chair/TeachingWs04IOIV/08CTReconstruction.pdf - * 2. Reconstruction. + * 2. Reconstruction. * http://oftankonyv.reak.bme.hu/tiki-index.php?page=Reconstruction */ itkGetConstMacro(RamLakCutFrequency, double); itkSetMacro(RamLakCutFrequency, double); - + /** Set/Get the Shepp-Logan window frequency (0...1). 0 (default) disable it. * Equation and further explanation about Shepp-Logan filter could be found in: - * 1. Fundamentals of 2D and 3D reconstruction (by Dr. Günter Lauritsch). + * 1. Fundamentals of 2D and 3D reconstruction (by Dr. Gunter Lauritsch). * http://campar.in.tum.de/twiki/pub/Chair/TeachingWs04IOIV/08CTReconstruction.pdf - * 2. Reconstruction. + * 2. Reconstruction. * http://oftankonyv.reak.bme.hu/tiki-index.php?page=Reconstruction */ itkGetConstMacro(SheppLoganCutFrequency, double); itkSetMacro(SheppLoganCutFrequency, double); - + protected: FFTRampImageFilter(); virtual ~FFTRampImageFilter() ITK_OVERRIDE {} @@ -147,8 +147,8 @@ class ITK_EXPORT FFTRampImageFilter : double m_CosineCutFrequency; double m_HammingFrequency; double m_HannCutFrequencyY; - - /** Cut frequency of Ram-Lak and Shepp-Logan + + /** Cut frequency of Ram-Lak and Shepp-Logan */ double m_RamLakCutFrequency; double m_SheppLoganCutFrequency; diff --git a/include/rtkForwardDifferenceGradientImageFilter.h b/include/rtkForwardDifferenceGradientImageFilter.h index 5de91fdea..f4407f830 100644 --- a/include/rtkForwardDifferenceGradientImageFilter.h +++ b/include/rtkForwardDifferenceGradientImageFilter.h @@ -38,9 +38,9 @@ namespace rtk * whose value type is specified as this third template parameter. * * The exact definition of the desired gradient filter can - * be found in Chambolle, Antonin. “An Algorithm for Total - * Variation Minimization and Applications.” J. Math. Imaging Vis. 20, - * no. 1–2 (January 2004): 89–97. + * be found in Chambolle, Antonin. "An Algorithm for Total + * Variation Minimization and Applications." J. Math. Imaging Vis. 20, + * no. 1-2 (January 2004): 89-97. * * \author Cyril Mory * diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx b/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx index b0814c7b3..8444e24d2 100644 --- a/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx +++ b/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx @@ -35,12 +35,12 @@ FourDROOSTERConeBeamReconstructionFilter: m_GammaTNV = 0.0002; m_LambdaL0Time = 0.005; m_SoftThresholdWavelets = 0.001; - + m_TV_iterations=10; m_MainLoop_iterations=10; m_CG_iterations=4; m_L0_iterations=5; - + // Default pipeline: 4DCG, positivity, motion mask, spatial TV, temporal TV m_PerformPositivity = true; m_PerformMotionMask = true; @@ -235,7 +235,7 @@ FourDROOSTERConeBeamReconstructionFilter { this->RemoveInput("MotionMask"); } - + if (m_PerformWarping) { typename DVFSequenceImageType::Pointer DisplacementFieldPtr = this->GetDisplacementField(); @@ -280,24 +280,24 @@ FourDROOSTERConeBeamReconstructionFilter m_FourDCGFilter->SetCudaConjugateGradient(this->GetCudaConjugateGradient()); m_FourDCGFilter->SetDisableDisplacedDetectorFilter(m_DisableDisplacedDetectorFilter); m_DownstreamFilter = m_FourDCGFilter; - + // Plug the positivity filter if requested if (m_PerformPositivity) { - m_PositivityFilter->SetInPlace(true); + m_PositivityFilter->SetInPlace(true); m_PositivityFilter->SetOutsideValue(0.0); m_PositivityFilter->ThresholdBelow(0.0); m_PositivityFilter->SetInput(m_DownstreamFilter->GetOutput()); - + m_DownstreamFilter = m_PositivityFilter; } - + // Etc.. if (m_PerformMotionMask) { - m_AverageOutOfROIFilter->SetInPlace(true); - + m_AverageOutOfROIFilter->SetInPlace(true); + m_AverageOutOfROIFilter->SetInput(m_DownstreamFilter->GetOutput()); m_ResampleFilter->SetInput(this->GetMotionMask()); m_AverageOutOfROIFilter->SetROI(m_ResampleFilter->GetOutput()); @@ -329,10 +329,10 @@ FourDROOSTERConeBeamReconstructionFilter m_ResampleFilter->SetOutputSpacing(VolumeSpacing); m_ResampleFilter->SetOutputOrigin(VolumeOrigin); m_ResampleFilter->SetOutputDirection(VolumeDirection); - + m_DownstreamFilter = m_AverageOutOfROIFilter; } - + if (m_PerformTVSpatialDenoising) { m_DownstreamFilter->ReleaseDataFlagOn(); @@ -345,39 +345,39 @@ FourDROOSTERConeBeamReconstructionFilter m_DimensionsProcessedForTVSpace[2]=true; m_DimensionsProcessedForTVSpace[3]=false; m_TVDenoisingSpace->SetDimensionsProcessed(this->m_DimensionsProcessedForTVSpace); - + m_DownstreamFilter = m_TVDenoisingSpace; } - + if (m_PerformWaveletsSpatialDenoising) { m_DownstreamFilter->ReleaseDataFlagOn(); - + m_WaveletsDenoisingSpace->SetInput(m_DownstreamFilter->GetOutput()); m_WaveletsDenoisingSpace->SetOrder(m_Order); m_WaveletsDenoisingSpace->SetThreshold(m_SoftThresholdWavelets); m_WaveletsDenoisingSpace->SetNumberOfLevels(m_NumberOfLevels); - + m_DownstreamFilter = m_WaveletsDenoisingSpace; } if (m_PerformWarping) { m_DownstreamFilter->ReleaseDataFlagOff(); - + m_Warp->SetInput(m_DownstreamFilter->GetOutput()); m_Warp->SetDisplacementField(this->GetDisplacementField()); m_Warp->SetPhaseShift(m_PhaseShift); m_Warp->SetUseNearestNeighborInterpolationInWarping(m_UseNearestNeighborInterpolationInWarping); m_Warp->SetUseCudaCyclicDeformation(m_UseCudaCyclicDeformation); - + m_DownstreamFilter = m_Warp; } - + if (m_PerformTVTemporalDenoising) { m_DownstreamFilter->ReleaseDataFlagOff(); - + if (m_PerformWarping && !m_ComputeInverseWarpingByConjugateGradient) m_TVDenoisingTime->SetInPlace(false); else @@ -392,10 +392,10 @@ FourDROOSTERConeBeamReconstructionFilter m_DimensionsProcessedForTVTime[3]=true; m_TVDenoisingTime->SetDimensionsProcessed(this->m_DimensionsProcessedForTVTime); m_TVDenoisingTime->SetBoundaryConditionToPeriodic(); - + m_DownstreamFilter = m_TVDenoisingTime; } - + if (m_PerformL0TemporalDenoising) { m_DownstreamFilter->ReleaseDataFlagOff(); @@ -404,16 +404,16 @@ FourDROOSTERConeBeamReconstructionFilter m_L0DenoisingTime->SetInPlace(false); else m_L0DenoisingTime->SetInPlace(true); - + m_L0DenoisingTime->SetInPlace(false); - + m_L0DenoisingTime->SetInput(m_DownstreamFilter->GetOutput()); m_L0DenoisingTime->SetNumberOfIterations(this->m_L0_iterations); m_L0DenoisingTime->SetLambda(this->m_LambdaL0Time); - + m_DownstreamFilter = m_L0DenoisingTime; } - + if (m_PerformTNVDenoising) { m_DownstreamFilter->ReleaseDataFlagOff(); @@ -449,7 +449,7 @@ FourDROOSTERConeBeamReconstructionFilter else { m_DownstreamFilter->ReleaseDataFlagOff(); - + // Compute the correction performed by temporal TV and/or temporal L0 and/or TNV m_SubtractFilter->SetInput1(m_DownstreamFilter->GetOutput()); m_SubtractFilter->SetInput2(m_Warp->GetOutput()); @@ -466,14 +466,14 @@ FourDROOSTERConeBeamReconstructionFilter m_AddFilter->SetInput2(m_Warp->GetInput()); m_DownstreamFilter = m_AddFilter; - + m_Warp->ReleaseDataFlagOff(); m_SubtractFilter->ReleaseDataFlagOn(); m_InverseWarp->ReleaseDataFlagOn(); m_AddFilter->ReleaseDataFlagOff(); } } - + // Have the last filter calculate its output information m_DownstreamFilter->ReleaseDataFlagOff(); m_DownstreamFilter->UpdateOutputInformation(); diff --git a/include/rtkFourDSARTConeBeamReconstructionFilter.hxx b/include/rtkFourDSARTConeBeamReconstructionFilter.hxx index a8d98a129..15741094a 100644 --- a/include/rtkFourDSARTConeBeamReconstructionFilter.hxx +++ b/include/rtkFourDSARTConeBeamReconstructionFilter.hxx @@ -59,7 +59,7 @@ FourDSARTConeBeamReconstructionFilter // Create the filter that enforces positivity m_ThresholdFilter = ThresholdFilterType::New(); - + //Permanent internal connections m_ZeroMultiplyFilter->SetInput1( itk::NumericTraits::ZeroValue() ); m_ZeroMultiplyFilter->SetInput2( m_ExtractFilter->GetOutput() ); @@ -166,7 +166,7 @@ template void FourDSARTConeBeamReconstructionFilter ::GenerateInputRequestedRegion() -{ +{ typename Superclass::InputImagePointer inputPtr = const_cast< VolumeSeriesType * >( this->GetInput() ); @@ -277,7 +277,7 @@ FourDSARTConeBeamReconstructionFilter m_DivideFilter->UpdateOutputInformation(); - + if(m_EnforcePositivity) { m_ThresholdFilter->SetOutsideValue(0); @@ -323,7 +323,7 @@ FourDSARTConeBeamReconstructionFilter subsetRegion.SetSize(Dimension-1, 1); m_MultiplyFilter->SetInput1( (const float) m_Lambda/(double)m_NumberOfProjectionsPerSubset ); - + // Create the zero projection stack used as input by RayBoxIntersectionFilter m_ConstantProjectionStackSource->Update(); diff --git a/include/rtkGgoFunctions.h b/include/rtkGgoFunctions.h index 2b06a2045..4a3c9a578 100644 --- a/include/rtkGgoFunctions.h +++ b/include/rtkGgoFunctions.h @@ -151,7 +151,7 @@ GetProjectionsFileNamesFromGgo(const TArgsInfo &args_info) } } } - + std::vector fileNames = names->GetFileNames(); rtk::RegisterIOFactories(); std::vector idxtopop; diff --git a/include/rtkImagXGeometryReader.h b/include/rtkImagXGeometryReader.h index 6fbc15d9c..e1393330c 100644 --- a/include/rtkImagXGeometryReader.h +++ b/include/rtkImagXGeometryReader.h @@ -107,7 +107,7 @@ class ImagXGeometryReader : public itk::LightProcessObject static const std::string m_AI_VERSION_1p2; static const std::string m_AI_VERSION_1p5; static const std::string m_AI_VERSION_2pX; - + // DICOM tags depend on AI version std::string getAIversion(); @@ -133,7 +133,7 @@ class ImagXGeometryReader : public itk::LightProcessObject }; InterpResultType interpolate(const std::vector& flexAngles, bool isCW, float angleDegree); - + // Structure containing the calibration models (for AI versions < 2.0) struct CalibrationModelType { bool isValid; @@ -143,7 +143,7 @@ class ImagXGeometryReader : public itk::LightProcessObject Tx, Ty, Tz; // Source translations model CalibrationModelType() { - sourceToNozzleOffsetAngle = -90.f; + sourceToNozzleOffsetAngle = -90.f; Px = std::vector(5, 0.f); Py = std::vector(5, 0.f); Pz = std::vector(5, 0.f); @@ -155,7 +155,7 @@ class ImagXGeometryReader : public itk::LightProcessObject Tz = std::vector(5, 0.f); } }; - + CalibrationModelType GetGeometryForAI1p5(); CalibrationModelType GetGeometryForAI1p5FromXMLFiles(); @@ -166,8 +166,8 @@ class ImagXGeometryReader : public itk::LightProcessObject // Evaluate the calibration models for a given angle std::vector getDeformations(float gantryAngle, const std::vector& Dx, const std::vector& Dy, const std::vector& Dz); - - void addEntryToGeometry(float gantryAngleDegree, float nozzleToRadAngleOffset, float sid, float sdd, + + void addEntryToGeometry(float gantryAngleDegree, float nozzleToRadAngleOffset, float sid, float sdd, std::vector& P, std::vector& R, std::vector& T); void addEntryToGeometry(const FlexmapType& flex, float gantryAngleDegree); diff --git a/include/rtkImagXGeometryReader.hxx b/include/rtkImagXGeometryReader.hxx index 2263cc688..587d30495 100644 --- a/include/rtkImagXGeometryReader.hxx +++ b/include/rtkImagXGeometryReader.hxx @@ -481,8 +481,8 @@ void ImagXGeometryReader::GenerateData() bool isImagX1p2 = (version.find(m_AI_VERSION_1p2) != std::string::npos); bool isImagX1p5 = (version.find(m_AI_VERSION_1p5) != std::string::npos); - bool isImagX2pX = (version.find(m_AI_VERSION_2pX) != std::string::npos); - + bool isImagX2pX = (version.find(m_AI_VERSION_2pX) != std::string::npos); + if(!isImagX1p2 && !isImagX1p5 && !isImagX2pX) { itkExceptionMacro("Unknown AI version : " << version); diff --git a/include/rtkInterpolatorWithKnownWeightsImageFilter.hxx b/include/rtkInterpolatorWithKnownWeightsImageFilter.hxx index e77a2ad6f..c2baf72b6 100644 --- a/include/rtkInterpolatorWithKnownWeightsImageFilter.hxx +++ b/include/rtkInterpolatorWithKnownWeightsImageFilter.hxx @@ -192,7 +192,7 @@ void InterpolatorWithKnownWeightsImageFilter } volumeSeriesSize[Dimension] = 1; volumeSeriesIndex[Dimension] = frame; - + volumeSeriesRegion.SetSize(volumeSeriesSize); volumeSeriesRegion.SetIndex(volumeSeriesIndex); diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx b/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx index fe658241b..76b9a76b0 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx @@ -103,7 +103,7 @@ TSumAlongRay > { break; } - } + } for (; !it.IsAtEnd(); ++it ) { diff --git a/include/rtkJosephBackProjectionImageFilter.h b/include/rtkJosephBackProjectionImageFilter.h index ed80152db..6ba966af8 100644 --- a/include/rtkJosephBackProjectionImageFilter.h +++ b/include/rtkJosephBackProjectionImageFilter.h @@ -132,7 +132,7 @@ class SplatWeightMultiplication * \brief Joseph back projection. * * Performs a back projection, i.e. smearing of ray value along its path, - * using [Joseph, IEEE TMI, 1982]. The back projector is the adjoint operator of the + * using [Joseph, IEEE TMI, 1982]. The back projector is the adjoint operator of the * forward projector * * \test rtkbackprojectiontest.cxx diff --git a/include/rtkLaplacianImageFilter.h b/include/rtkLaplacianImageFilter.h index 0ed587f98..df1b847c6 100644 --- a/include/rtkLaplacianImageFilter.h +++ b/include/rtkLaplacianImageFilter.h @@ -30,9 +30,9 @@ namespace rtk * * Computes the gradient of the input image, then the divergence of * this gradient. The exact definition of the gradient and divergence filters can - * be found in Chambolle, Antonin. “An Algorithm for Total - * Variation Minimization and Applications.” J. Math. Imaging Vis. 20, - * no. 1–2 (January 2004): 89–97. The border conditions are described there. + * be found in Chambolle, Antonin. "An Algorithm for Total + * Variation Minimization and Applications." J. Math. Imaging Vis. 20, + * no. 1-2 (January 2004): 89-97. The border conditions are described there. * * \ingroup RTK IntensityImageFilters */ @@ -52,7 +52,7 @@ class LaplacianImageFilter : public itk::ImageToImageFilter< OutputImageType, Ou typename OutputImageType::ValueType, GradientImageType> GradientFilterType; typedef rtk::BackwardDifferenceDivergenceImageFilter DivergenceFilterType; - + /** Method for creation through the object factory. */ itkNewMacro(Self) diff --git a/include/rtkLaplacianImageFilter.hxx b/include/rtkLaplacianImageFilter.hxx index 93d187f25..63c37eb87 100644 --- a/include/rtkLaplacianImageFilter.hxx +++ b/include/rtkLaplacianImageFilter.hxx @@ -30,10 +30,10 @@ LaplacianImageFilter::LaplacianImageFilter() // Create the filters m_Gradient = GradientFilterType::New(); m_Divergence = DivergenceFilterType::New(); - + // Set permanent connections between filters m_Divergence->SetInput(m_Gradient->GetOutput()); - + // Set memory management parameters m_Gradient->ReleaseDataFlagOn(); } @@ -43,10 +43,10 @@ void LaplacianImageFilter ::GenerateOutputInformation() { Superclass::GenerateOutputInformation(); - + // Set runtime connections m_Gradient->SetInput(this->GetInput()); - + // Update the last filter m_Divergence->UpdateOutputInformation(); @@ -60,7 +60,7 @@ void LaplacianImageFilter { // Update the last filter m_Divergence->Update(); - + // Graft its output to the composite filter's output this->GraftOutput(m_Divergence->GetOutput()); } diff --git a/include/rtkLastDimensionL0GradientDenoisingImageFilter.hxx b/include/rtkLastDimensionL0GradientDenoisingImageFilter.hxx index ac7f5cd2e..2dbb8715a 100644 --- a/include/rtkLastDimensionL0GradientDenoisingImageFilter.hxx +++ b/include/rtkLastDimensionL0GradientDenoisingImageFilter.hxx @@ -89,31 +89,31 @@ LastDimensionL0GradientDenoisingImageFilter< TInputImage > weights[i] = 1.0; values[i] = input[i]; } - + // Main loop for (unsigned int iter=0; iter firsts[length-1] = 0; values[length-1] = 0; weights[length-1] = 0; - + // Decrement the total number of groups nbGroups--; } - + // Move to next group i++; } } - + // Assemble the pieces to create the denoised output (overwriting the input) for (unsigned int i=0; i // Walk the input along last dimension for this voxel, filling an array with the values read itk::ImageRegionConstIterator inputIterator(this->GetInput(), SingleVoxelRegion); InputPixelType* toBeRegularized = new InputPixelType[outputRegionForThread.GetSize(TInputImage::ImageDimension - 1)]; - + unsigned int i=0; while (!inputIterator.IsAtEnd()) { @@ -187,10 +187,10 @@ LastDimensionL0GradientDenoisingImageFilter< TInputImage > i++; ++inputIterator; } - + // Perform regularization (in place) on this array OneDimensionMinimizeL0NormOfGradient(toBeRegularized, outputRegionForThread.GetSize(TInputImage::ImageDimension - 1), this->GetLambda(), this->GetNumberOfIterations()); - + // Walk the output along last dimension for this voxel, // replacing voxel with their regularized value itk::ImageRegionIterator outputIterator(this->GetOutput(), SingleVoxelRegion); @@ -203,7 +203,7 @@ LastDimensionL0GradientDenoisingImageFilter< TInputImage > } delete [] toBeRegularized; - + ++FakeIterator; } } diff --git a/include/rtkMagnitudeThresholdImageFilter.h b/include/rtkMagnitudeThresholdImageFilter.h index eaa3a132e..539f788ab 100644 --- a/include/rtkMagnitudeThresholdImageFilter.h +++ b/include/rtkMagnitudeThresholdImageFilter.h @@ -43,7 +43,7 @@ class ITK_EXPORT MagnitudeThresholdImageFilter: public itk::InPlaceImageFilter< TInputImage, TOutputImage > { public: - + /** Standard class typedefs. */ typedef MagnitudeThresholdImageFilter Self; typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass; @@ -94,7 +94,7 @@ class ITK_EXPORT MagnitudeThresholdImageFilter: itkGetMacro(Threshold, TRealType) itkSetMacro(Threshold, TRealType) - + protected: MagnitudeThresholdImageFilter(); virtual ~MagnitudeThresholdImageFilter() ITK_OVERRIDE {} diff --git a/include/rtkMechlemOneStepSpectralReconstructionFilter.h b/include/rtkMechlemOneStepSpectralReconstructionFilter.h index ce054d40f..b139430e6 100644 --- a/include/rtkMechlemOneStepSpectralReconstructionFilter.h +++ b/include/rtkMechlemOneStepSpectralReconstructionFilter.h @@ -50,7 +50,7 @@ namespace rtk * * \dot * digraph MechlemOneStepSpectralReconstructionFilter { - * + * * Input0 [ label="Input 0 (Material volumes)"]; * Input0 [shape=Mdiamond]; * Input1 [label="Input 1 (Photon counts)"]; @@ -59,7 +59,7 @@ namespace rtk * Input2 [shape=Mdiamond]; * Output [label="Output (Material volumes)"]; * Output [shape=Mdiamond]; - * + * * node [shape=box]; * Extract [ label="itk::ExtractImageFilter" URL="\ref itk::ExtractImageFilter"]; * VolumeSource [ label="rtk::ConstantImageSource (1 component volume, full of ones)" URL="\ref rtk::ConstantImageSource"]; @@ -79,7 +79,7 @@ namespace rtk * Nesterov [ label="rtk::NesterovUpdateImageFilter" URL="\ref rtk::NesterovUpdateImageFilter"]; * Alphak [ label="", fixedsize="false", width=0, height=0, shape=none]; * NextAlphak [ label="", fixedsize="false", width=0, height=0, shape=none]; - * + * * Input0 -> Alphak [arrowhead=none]; * Alphak -> ForwardProjection; * Alphak -> SQSRegul; diff --git a/include/rtkOraLookupTableImageFilter.h b/include/rtkOraLookupTableImageFilter.h index 274568516..b87656497 100644 --- a/include/rtkOraLookupTableImageFilter.h +++ b/include/rtkOraLookupTableImageFilter.h @@ -47,7 +47,7 @@ class ITK_EXPORT OraLookupTableImageFilter: public: /** Standard class typedefs. */ typedef OraLookupTableImageFilter Self; - typedef LookupTableImageFilter, TOutputImage> Superclass; typedef itk::SmartPointer Pointer; diff --git a/include/rtkProjectionStackToFourDImageFilter.hxx b/include/rtkProjectionStackToFourDImageFilter.hxx index 1237caac2..d54fbecee 100644 --- a/include/rtkProjectionStackToFourDImageFilter.hxx +++ b/include/rtkProjectionStackToFourDImageFilter.hxx @@ -131,7 +131,7 @@ ProjectionStackToFourDImageFilter lambdas = ForwardModel(lineIntegrals); - // Compute the vector of m_b / lambda_b² + // Compute the vector of m_b / lambda_b^2 vnl_vector weights; weights.set_size(m_NumberOfSpectralBins); for (unsigned int i=0; i Superclass; typedef itk::SmartPointer< Self > Pointer; - + /** Method for creation through the object factory. */ itkNewMacro(Self) diff --git a/include/rtkSoftThresholdImageFilter.h b/include/rtkSoftThresholdImageFilter.h index 3c0c38106..91ac94bfc 100644 --- a/include/rtkSoftThresholdImageFilter.h +++ b/include/rtkSoftThresholdImageFilter.h @@ -25,7 +25,7 @@ namespace rtk { - + /** \class SoftThresholdImageFilter * * \brief Soft thresholds an image @@ -37,8 +37,8 @@ namespace rtk * \ingroup RTK IntensityImageFilters Multithreaded */ -namespace Functor { - +namespace Functor { + template< class TInput, class TOutput> class SoftThreshold { @@ -81,7 +81,7 @@ class ITK_EXPORT SoftThresholdImageFilter : public itk::UnaryFunctorImageFilter > { public: @@ -109,7 +109,7 @@ itk::UnaryFunctorImageFilter, + itk::Image< itk::CovariantVector < typename TOutputImage::ValueType, TOutputImage::ImageDimension >, TOutputImage::ImageDimension > > class TotalVariationDenoisingBPDQImageFilter : public rtk::DenoisingBPDQImageFilter< TOutputImage, TGradientImage > diff --git a/include/rtkUnwarpSequenceConjugateGradientOperator.hxx b/include/rtkUnwarpSequenceConjugateGradientOperator.hxx index 51fa31c8d..bf165b3c8 100644 --- a/include/rtkUnwarpSequenceConjugateGradientOperator.hxx +++ b/include/rtkUnwarpSequenceConjugateGradientOperator.hxx @@ -110,7 +110,7 @@ UnwarpSequenceConjugateGradientOperator< TImageSequence, TDVFImageSequence, TIma } template< typename TImageSequence, typename TDVFImageSequence, typename TImage, typename TDVFImage> -void +void UnwarpSequenceConjugateGradientOperator< TImageSequence, TDVFImageSequence, TImage, TDVFImage> ::GenerateData() { diff --git a/include/rtkUnwarpSequenceImageFilter.h b/include/rtkUnwarpSequenceImageFilter.h index 55bbbcd8c..9e8c3e8b9 100644 --- a/include/rtkUnwarpSequenceImageFilter.h +++ b/include/rtkUnwarpSequenceImageFilter.h @@ -38,20 +38,20 @@ namespace rtk * * \dot * digraph UnwarpSequenceImageFilter { - * + * * Input0 [ label="Input 0 (4D volume sequence)"]; * Input0 [shape=Mdiamond]; * Input1 [label="Input 1 (4D DVF)"]; * Input1 [shape=Mdiamond]; * Output [label="Output (4D volume sequence)"]; * Output [shape=Mdiamond]; - * + * * node [shape=box]; * ConstantSource [label="rtk::ConstantImageSource (4D volume sequence)" URL="\ref rtk::WarpSequenceImageFilter"]; * WarpSequenceForward [label="rtk::WarpSequenceImageFilter (forward mapping)" URL="\ref rtk::WarpSequenceImageFilter"]; * ConjugateGradient[ label="rtk::ConjugateGradientImageFilter" URL="\ref rtk::ConjugateGradientImageFilter"]; * CyclicDeformation [label="rtk::CyclicDeformationImageFilter (for DVFs)" URL="\ref rtk::CyclicDeformationImageFilter"]; - * + * * Input0 -> WarpSequenceForward; * Input1 -> CyclicDeformation; * CyclicDeformation -> WarpSequenceForward; diff --git a/include/rtkUnwarpSequenceImageFilter.hxx b/include/rtkUnwarpSequenceImageFilter.hxx index 9bf6d3784..12b358278 100644 --- a/include/rtkUnwarpSequenceImageFilter.hxx +++ b/include/rtkUnwarpSequenceImageFilter.hxx @@ -49,7 +49,7 @@ UnwarpSequenceImageFilter< TImageSequence, TDVFImageSequence, TImage, TDVFImage> #endif m_WarpForwardFilter = WarpForwardFilterType::New(); m_CGOperator = CGOperatorFilterType::New(); - + // Set permanent connections m_ConjugateGradientFilter->SetB(m_WarpForwardFilter->GetOutput()); m_ConjugateGradientFilter->SetX(m_ConstantSource->GetOutput()); @@ -132,9 +132,9 @@ UnwarpSequenceImageFilter< TImageSequence, TDVFImageSequence, TImage, TDVFImage> m_ConjugateGradientFilter->Update(); this->GraftOutput( m_ConjugateGradientFilter->GetOutput() ); - - // During mini-pipeline execution, the requested region on the primary input - // is modified by the extract filters contained in the warp filters. This + + // During mini-pipeline execution, the requested region on the primary input + // is modified by the extract filters contained in the warp filters. This typename TImageSequence::Pointer inputPtr = const_cast(this->GetInput(0)); inputPtr->SetRequestedRegionToLargestPossibleRegion(); diff --git a/include/rtkUpsampleImageFilter.h b/include/rtkUpsampleImageFilter.h index 7e6fef1e5..759997ff2 100644 --- a/include/rtkUpsampleImageFilter.h +++ b/include/rtkUpsampleImageFilter.h @@ -29,7 +29,7 @@ namespace rtk * * This filter is inspired from Dan Mueller's GIFT package * http://www.insight-journal.org/browse/publication/103 - * + * * \author Cyril Mory * * \ingroup RTK @@ -46,7 +46,7 @@ class ITK_EXPORT UpsampleImageFilter: typedef itk::SmartPointer ConstPointer; /** Method for creation through the object factory. */ - itkNewMacro(Self); + itkNewMacro(Self); /** Run-time type information (and related methods). */ itkTypeMacro(UpsampleImageFilter, ImageToImageFilter); @@ -68,7 +68,7 @@ class ITK_EXPORT UpsampleImageFilter: /** Set the shrink factors. Values are clamped to * a minimum value of 1.*/ void SetFactors(unsigned int factors[]); - + /** Sets the shrink factor for the given dimension. * All other dimensions are set to 1 */ void SetFactor(unsigned int dimension, unsigned int factor); @@ -146,11 +146,11 @@ class ITK_EXPORT UpsampleImageFilter: typename TOutputImage::IndexType m_OutputIndex; }; - + } // end namespace rtk - + #ifndef rtk_MANUAL_INSTANTIATION #include "rtkUpsampleImageFilter.hxx" #endif - + #endif diff --git a/include/rtkUpsampleImageFilter.hxx b/include/rtkUpsampleImageFilter.hxx index b70dc9d6a..e2c95ad15 100644 --- a/include/rtkUpsampleImageFilter.hxx +++ b/include/rtkUpsampleImageFilter.hxx @@ -80,7 +80,7 @@ UpsampleImageFilter } template -void +void UpsampleImageFilter #if ITK_VERSION_MAJOR<5 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId)) @@ -192,7 +192,7 @@ UpsampleImageFilter } template -void +void UpsampleImageFilter ::GenerateInputRequestedRegion() { @@ -212,7 +212,7 @@ UpsampleImageFilter } template -void +void UpsampleImageFilter ::GenerateOutputInformation() { diff --git a/include/rtkVarianObiGeometryReader.h b/include/rtkVarianObiGeometryReader.h index 3d2905c66..6c2e8520f 100644 --- a/include/rtkVarianObiGeometryReader.h +++ b/include/rtkVarianObiGeometryReader.h @@ -27,7 +27,7 @@ namespace rtk /** \class VarianObiGeometryReader * - * Creates a 3D circular geometry from Varian OBI data. + * Creates a 3D circular geometry from Varian OBI data. * * \test rtkvariantest.cxx * diff --git a/include/rtkVarianObiRawImageFilter.h b/include/rtkVarianObiRawImageFilter.h index 666445fe9..c2e391007 100644 --- a/include/rtkVarianObiRawImageFilter.h +++ b/include/rtkVarianObiRawImageFilter.h @@ -28,8 +28,8 @@ namespace rtk { -namespace Function { - +namespace Function { + /** \class ObiAttenuation * \brief Converts a raw value measured by the Varian OBI system to attenuation * @@ -79,15 +79,15 @@ class ObiAttenuation template class ITK_EXPORT VarianObiRawImageFilter : public -itk::UnaryFunctorImageFilter > { public: /** Standard class typedefs. */ typedef VarianObiRawImageFilter Self; - typedef itk::UnaryFunctorImageFilter > Superclass; typedef itk::SmartPointer Pointer; diff --git a/itk-module-init.cmake b/itk-module-init.cmake index c8b02b359..3c61659c4 100644 --- a/itk-module-init.cmake +++ b/itk-module-init.cmake @@ -1,7 +1,7 @@ # # Find the packages required by this module # -list(APPEND CMAKE_MODULE_PATH ${RTK_SOURCE_DIR}/cmake) +list(APPEND CMAKE_MODULE_PATH ${RTK_SOURCE_DIR}/cmake) find_package(CUDA_wrap QUIET) if(CUDA_FOUND) diff --git a/src/rtkCudaLagCorrectionImageFilter.cu b/src/rtkCudaLagCorrectionImageFilter.cu index dccf06a6e..bb2cfa1fe 100644 --- a/src/rtkCudaLagCorrectionImageFilter.cu +++ b/src/rtkCudaLagCorrectionImageFilter.cu @@ -56,13 +56,13 @@ float *state tIdx.z + proj_idx_out.z); // combined proj. index -> use thread index in z because accessing memory only with this index long int pIdx_comp = (pIdx.x - proj_idx_in.x) + (pIdx.y - proj_idx_in.y) * proj_size_in_buf.x + (pIdx.z - proj_idx_in.z) * proj_size_in_buf.x * proj_size_in_buf.y; - + long int sIdx_comp = tIdx.x + tIdx.y * proj_size_out.x; unsigned idx_s = sIdx_comp*modelOrder; - + float yk = static_cast(dev_proj_in[pIdx_comp]); float xk = yk; - + float Sa[modelOrder]; for (unsigned int n = 0; n < modelOrder; n++) { @@ -117,7 +117,7 @@ int state_size, float *coefficients) if (cudaMemcpy(d_state, h_state, state_size, cudaMemcpyHostToDevice) != cudaSuccess) { std::cout << "Error allocating state" << std::endl; } - + if (coefficients[8] <= 0.0) coefficients[8] = 1.0; diff --git a/src/rtkCudaLastDimensionTVDenoisingImageFilter.cxx b/src/rtkCudaLastDimensionTVDenoisingImageFilter.cxx index e55446418..e7d579135 100644 --- a/src/rtkCudaLastDimensionTVDenoisingImageFilter.cxx +++ b/src/rtkCudaLastDimensionTVDenoisingImageFilter.cxx @@ -41,12 +41,12 @@ ::GPUGenerateData() // this->GetInput()->Print(std::cout); // std::cout << "PRINTING OUTPUT" << std::endl; // this->GetOutput()->Print(std::cout); - + for (int i=0; i<4; i++) { inputSize[i] = this->GetInput()->GetBufferedRegion().GetSize()[i]; outputSize[i] = this->GetOutput()->GetBufferedRegion().GetSize()[i]; - + if (inputSize[i] != outputSize[i]) { diff --git a/src/rtkCudaPolynomialGainCorrectionImageFilter.cu b/src/rtkCudaPolynomialGainCorrectionImageFilter.cu index 2e0c3ddd1..52745a6ae 100644 --- a/src/rtkCudaPolynomialGainCorrectionImageFilter.cu +++ b/src/rtkCudaPolynomialGainCorrectionImageFilter.cu @@ -54,16 +54,16 @@ float *powerlut int3 pIdx = make_int3(tIdx.x + proj_idx_out.x, tIdx.y + proj_idx_out.y, tIdx.z + proj_idx_out.z); // combined proj. index -> use thread index in z because accessing memory only with this index long int pIdx_comp = (pIdx.x - proj_idx_in.x) + (pIdx.y - proj_idx_in.y) * proj_size_in_buf.x + (pIdx.z - proj_idx_in.z) * proj_size_in_buf.x * proj_size_in_buf.y; - + int modelOrder = static_cast(cst_coef[0]); long int sIdx_comp = tIdx.x + tIdx.y * proj_size_out.x; // in-slice index - + // Correct for dark field unsigned short xk = 0; if (dev_proj_in[pIdx_comp] > dev_dark_in[sIdx_comp]) xk = dev_proj_in[pIdx_comp] - dev_dark_in[sIdx_comp]; - + float yk = 0.f; int lutidx = xk*modelOrder; // index to powerlut int projsize = proj_size_in.x * proj_size_in.y; @@ -79,7 +79,7 @@ float *powerlut // Avoid negative values yk = (yk < 0.0f) ? 0.f : yk; - + dev_proj_out[tIdx_comp] = yk; } diff --git a/src/rtkCudaPolynomialGainCorrectionImageFilter.cxx b/src/rtkCudaPolynomialGainCorrectionImageFilter.cxx index be857a5b5..cadd09396 100644 --- a/src/rtkCudaPolynomialGainCorrectionImageFilter.cxx +++ b/src/rtkCudaPolynomialGainCorrectionImageFilter.cxx @@ -38,7 +38,7 @@ ::GPUGenerateData() { // compute overlap region by cropping output region with input buffer OutputImageRegionType overlapRegion = this->GetOutput()->GetRequestedRegion(); - + // Put the two data pointers at the same location unsigned short *inBuffer = *static_cast(this->GetInput()->GetCudaDataManager()->GetGPUBufferPointer()); inBuffer += this->GetInput()->ComputeOffset(overlapRegion.GetIndex()); @@ -46,9 +46,9 @@ ::GPUGenerateData() outBuffer += this->GetOutput()->ComputeOffset( this->GetOutput()->GetRequestedRegion().GetIndex() ); unsigned short *darkBuffer = *static_cast(m_DarkImage->GetCudaDataManager()->GetGPUBufferPointer()); - + float *gainBuffer = *static_cast(m_GainImage->GetCudaDataManager()->GetGPUBufferPointer()); - + int proj_idx_in[3]; proj_idx_in[0] = overlapRegion.GetIndex()[0]; proj_idx_in[1] = overlapRegion.GetIndex()[1]; diff --git a/src/rtkCudaWarpForwardProjectionImageFilter.cu b/src/rtkCudaWarpForwardProjectionImageFilter.cu index 9a9578759..64d5f9195 100644 --- a/src/rtkCudaWarpForwardProjectionImageFilter.cu +++ b/src/rtkCudaWarpForwardProjectionImageFilter.cu @@ -189,7 +189,7 @@ CUDA_warp_forward_project( int projSize[3], // Prepare channel description for arrays static cudaChannelFormatDesc channelDesc = cudaCreateChannelDesc(); - + // Extent stuff, will be used for each component extraction cudaExtent dvfExtent = make_cudaExtent(dvfSize[0], dvfSize[1], dvfSize[2]); diff --git a/src/rtkElektaSynergyGeometryReader.cxx b/src/rtkElektaSynergyGeometryReader.cxx index 6165854b2..db6b5fe71 100644 --- a/src/rtkElektaSynergyGeometryReader.cxx +++ b/src/rtkElektaSynergyGeometryReader.cxx @@ -37,7 +37,7 @@ ::GetImageIDFromDicomUID() // Open frame database file rtk::DbfFile dbImage(m_ImageDbfFileName); if( !dbImage.is_open() ) - itkGenericExceptionMacro( << "Couldn't open " + itkGenericExceptionMacro( << "Couldn't open " << m_ImageDbfFileName); // Search for correct record @@ -69,7 +69,7 @@ ::GetProjInfoFromDB(const std::string &imageID, // Open frame database file rtk::DbfFile dbFrame(m_FrameDbfFileName); if( !dbFrame.is_open() ) - itkGenericExceptionMacro( << "Couldn't open " + itkGenericExceptionMacro( << "Couldn't open " << m_FrameDbfFileName); // Go through the database, select correct records and get data diff --git a/src/rtkGeometricPhantomFileReader.cxx b/src/rtkGeometricPhantomFileReader.cxx index 17a97bae9..b237cba5d 100644 --- a/src/rtkGeometricPhantomFileReader.cxx +++ b/src/rtkGeometricPhantomFileReader.cxx @@ -64,7 +64,7 @@ ::GenerateOutputInformation() //Saving all parameters for each ellipsoid } parameters.push_back(val); - } + } ConvexShape::Pointer cs; QuadricShape::VectorType axis; QuadricShape::PointType center; diff --git a/src/rtkThreeDCircularProjectionGeometryXMLFileReader.cxx b/src/rtkThreeDCircularProjectionGeometryXMLFileReader.cxx index 1334e00a9..504205f85 100644 --- a/src/rtkThreeDCircularProjectionGeometryXMLFileReader.cxx +++ b/src/rtkThreeDCircularProjectionGeometryXMLFileReader.cxx @@ -182,7 +182,7 @@ EndElement(const char *name) if( fabs(m_Matrix[i][j]-m_OutputObject->GetMatrices().back()[i][j]) > 0.001 ) { itkGenericExceptionMacro(<< "Matrix and parameters are not consistent." - << std::endl << "Read matrix from geometry file: " + << std::endl << "Read matrix from geometry file: " << std::endl << m_Matrix << std::endl << "Computed matrix from parameters:" << std::endl << m_OutputObject->GetMatrices().back()); diff --git a/src/rtkThreeDCircularProjectionGeometryXMLFileWriter.cxx b/src/rtkThreeDCircularProjectionGeometryXMLFileWriter.cxx index e60129896..67ab63aa2 100644 --- a/src/rtkThreeDCircularProjectionGeometryXMLFileWriter.cxx +++ b/src/rtkThreeDCircularProjectionGeometryXMLFileWriter.cxx @@ -65,7 +65,7 @@ WriteFile() << '"'; this->WriteStartElement(startWithVersion.str().c_str(),output); output << std::endl; - + // First, we test for each of the 9 parameters per projection if it's constant // over all projection images except GantryAngle which is supposed to be different // for all projections. If 0. for OutOfPlaneAngle, InPlaneAngle, projection and source diff --git a/src/rtkXimImageIO.cxx b/src/rtkXimImageIO.cxx index 48aa51e19..a1b3e1e0c 100644 --- a/src/rtkXimImageIO.cxx +++ b/src/rtkXimImageIO.cxx @@ -218,7 +218,7 @@ void rtk::XimImageIO::ReadImageInformation() this->SetPixelType(itk::ImageIOBase::SCALAR); this->SetComponentType(itk::ImageIOBase::UINT); // 32 bit ints - + /* Store important meta information in the meta data dictionary */ if (xim.SizeX * xim.SizeY != 0){ itk::EncapsulateMetaData(this->GetMetaDataDictionary(), "dCTProjectionAngle", xim.dCTProjectionAngle); @@ -358,7 +358,7 @@ void rtk::XimImageIO::Read(void * buffer) for (int lut_idx = 0; lut_idx < lookUpTableSize; lut_idx++) { char v = m_lookup_table[lut_idx]; - + vsub = v & 0b00000011; // 0x03 auto diff1 = get_diff(vsub, fp); vsub = (v & 0b00001100) >> 2; // 0x0C diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9cc4d9190..406c546bf 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -272,7 +272,7 @@ rtk_add_cuda_test(rtkIterativeFDKCudaTest rtkiterativefdktest.cxx) rtk_add_cuda_test(rtkConjugateGradientReconstructionCudaTest rtkconjugategradientreconstructiontest.cxx) rtk_add_cuda_test(rtkFourDRoosterCudaTest rtkfourdroostertest.cxx) rtk_add_cuda_test(rtkADMMWaveletsCudaTest rtkadmmwaveletstest.cxx) -rtk_add_cuda_test(rtkADMMTotalVariationCudaTest rtkadmmtotalvariationtest.cxx +rtk_add_cuda_test(rtkADMMTotalVariationCudaTest rtkadmmtotalvariationtest.cxx DATA{Input/Phases/phases.txt} DATA{Input/Phases/phases_3projs.txt}) rtk_add_cuda_test(rtkRegularizedConjugateGradientCudaTest rtkregularizedconjugategradienttest.cxx) diff --git a/test/rtkadjointoperatorstest.cxx b/test/rtkadjointoperatorstest.cxx index 724fd8ba7..6881cda3f 100644 --- a/test/rtkadjointoperatorstest.cxx +++ b/test/rtkadjointoperatorstest.cxx @@ -53,7 +53,7 @@ int main(int, char** ) ConstantImageSourceType::Pointer constantVolumeSource = ConstantImageSourceType::New(); ConstantImageSourceType::Pointer constantProjectionsSource = ConstantImageSourceType::New(); ConstantImageSourceType::Pointer constantAttenuationSource = ConstantImageSourceType::New(); - + // Image meta data RandomImageSourceType::PointType origin; RandomImageSourceType::SizeType size; diff --git a/test/rtkadmmtotalvariationtest.cxx b/test/rtkadmmtotalvariationtest.cxx index 97559b890..dc65c18f6 100644 --- a/test/rtkadmmtotalvariationtest.cxx +++ b/test/rtkadmmtotalvariationtest.cxx @@ -36,11 +36,11 @@ int main(int argc, char*argv[]) #ifdef USE_CUDA typedef itk::CudaImage< OutputPixelType, Dimension > OutputImageType; - typedef itk::CudaImage< itk::CovariantVector + typedef itk::CudaImage< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #else typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #endif diff --git a/test/rtkadmmwaveletstest.cxx b/test/rtkadmmwaveletstest.cxx index 5624a79f1..10c706b18 100644 --- a/test/rtkadmmwaveletstest.cxx +++ b/test/rtkadmmwaveletstest.cxx @@ -88,11 +88,11 @@ int main(int, char** ) #ifdef USE_CUDA typedef itk::CudaImage< OutputPixelType, Dimension > OutputImageType; - typedef itk::CudaImage< itk::CovariantVector + typedef itk::CudaImage< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #else typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #endif diff --git a/test/rtkcheckimagequality.cxx b/test/rtkcheckimagequality.cxx index 36a6564e3..b01f5bade 100644 --- a/test/rtkcheckimagequality.cxx +++ b/test/rtkcheckimagequality.cxx @@ -8,7 +8,7 @@ * \file rtkcheckimagequality.cxx * * \brief Check the quality of the input image - * If a baseline is provided then a pixel quality + * If a baseline is provided then a pixel quality * * \author Julien Jomier */ @@ -27,7 +27,7 @@ int main(int argc, char** argv) typedef itk::ImageFileReader ReaderType; ReaderType::Pointer reader = ReaderType::New(); reader->SetFileName(argv[1]); - + try { reader->Update(); diff --git a/test/rtkcroptest.cxx b/test/rtkcroptest.cxx index 8f6069ae8..e76c6cfbe 100644 --- a/test/rtkcroptest.cxx +++ b/test/rtkcroptest.cxx @@ -26,7 +26,7 @@ int main(int , char** ) typedef rtk::CudaCropImageFilter CropImageFilter; CropImageFilter::Pointer crop = CropImageFilter::New(); crop->SetInput(image); - + ImageType::SizeType upCropSize, lowCropSize; for(unsigned int i=0; iSetUpperBoundaryCropSize(upCropSize); crop->SetLowerBoundaryCropSize(lowCropSize); - + try { crop->Update(); } - catch( itk::ExceptionObject & err ) - { - std::cerr << err << std::endl; - exit(EXIT_FAILURE); + catch( itk::ExceptionObject & err ) + { + std::cerr << err << std::endl; + exit(EXIT_FAILURE); } - + ImageType::IndexType index; index.Fill(2); - + if(fabs(crop->GetOutput()->GetPixel(index)-12.3)>0.0001) { - std::cout << "Output should be 12.3. Value Computed = " + std::cout << "Output should be 12.3. Value Computed = " << crop->GetOutput()->GetPixel(index) << std::endl; return EXIT_FAILURE; } - + std::cout << "Done!" << std::endl; std::cout << "\n\nTest PASSED! " << std::endl; diff --git a/test/rtkcudaraycastadjointoperatorstest.cxx b/test/rtkcudaraycastadjointoperatorstest.cxx index 4e9b815bc..a11f154ce 100644 --- a/test/rtkcudaraycastadjointoperatorstest.cxx +++ b/test/rtkcudaraycastadjointoperatorstest.cxx @@ -11,7 +11,7 @@ * \brief Tests whether CUDA ray cast forward and back projectors are matched * * This test generates a random volume "v" and a random set of projections "p", - * and compares the scalar products and , where R is the + * and compares the scalar products and , where R is the * CUDA ray cast forward projector and R* is the CUDA ray cast back projector. If R* is indeed * the adjoint of R, these scalar products are equal. * @@ -45,7 +45,7 @@ int main(int, char** ) typedef rtk::ConstantImageSource< OutputImageType > ConstantImageSourceType; ConstantImageSourceType::Pointer constantVolumeSource = ConstantImageSourceType::New(); ConstantImageSourceType::Pointer constantProjectionsSource = ConstantImageSourceType::New(); - + // Image meta data RandomImageSourceType::PointType origin; RandomImageSourceType::SizeType size; @@ -134,14 +134,14 @@ int main(int, char** ) TRY_AND_EXIT_ON_ITK_EXCEPTION( fw->Update() ); std::cout << "\n\n****** CUDA ray cast Back projector, flat panel detector ******" << std::endl; - + typedef rtk::CudaRayCastBackProjectionImageFilter BackProjectorType; BackProjectorType::Pointer bp = BackProjectorType::New(); bp->SetInput(0, constantVolumeSource->GetOutput()); bp->SetInput(1, randomProjectionsSource->GetOutput()); bp->SetGeometry( geometry.GetPointer() ); bp->SetNormalize(false); - + TRY_AND_EXIT_ON_ITK_EXCEPTION( bp->Update() ); CheckScalarProducts(randomVolumeSource->GetOutput(), bp->GetOutput(), randomProjectionsSource->GetOutput(), fw->GetOutput()); diff --git a/test/rtkforwardprojectiontest.cxx b/test/rtkforwardprojectiontest.cxx index 31dc64f7c..7274a229e 100644 --- a/test/rtkforwardprojectiontest.cxx +++ b/test/rtkforwardprojectiontest.cxx @@ -196,7 +196,7 @@ int main(int , char** ) dsl->InPlaceOff(); dsl->SetInput( volInput->GetOutput() ); dsl->Update(); - + // Forward projection jfp->SetInput( 1, dsl->GetOutput() ); stream->Update(); diff --git a/test/rtkfourdadjointoperatorstest.cxx b/test/rtkfourdadjointoperatorstest.cxx index 13f0d31ad..72849f214 100644 --- a/test/rtkfourdadjointoperatorstest.cxx +++ b/test/rtkfourdadjointoperatorstest.cxx @@ -17,7 +17,7 @@ * are the adjoint of one another. * * This test generates a random 4D volume "v" and a random set of projections "p", - * and compares the scalar products and , where R is the + * and compares the scalar products and , where R is the * FourDToProjectionStack filter and R* is the ProjectionStackToFourD. If R* is indeed * the adjoint of R, these scalar products are equal. * @@ -64,7 +64,7 @@ int main(int argc, char*argv[]) typedef rtk::ConstantImageSource< VolumeSeriesType > ConstantVolumeSeriesSourceType; ConstantVolumeSeriesSourceType::Pointer constantVolumeSeriesSource = ConstantVolumeSeriesSourceType::New(); - + // Volume metadata VolumeSeriesType::PointType fourDOrigin; VolumeSeriesType::SizeType fourDSize; diff --git a/test/rtkfourdroostertest.cxx b/test/rtkfourdroostertest.cxx index 3cb1d0285..ff9189a8f 100644 --- a/test/rtkfourdroostertest.cxx +++ b/test/rtkfourdroostertest.cxx @@ -366,11 +366,11 @@ int main(int, char** ) rooster->SetGeometry( geometry ); rooster->SetCG_iterations( 2 ); rooster->SetMainLoop_iterations( 2); - + rooster->SetTV_iterations( 3 ); rooster->SetGammaTVSpace(1); rooster->SetGammaTVTime(0.1); - + rooster->SetSoftThresholdWavelets(0.1); rooster->SetOrder(3); rooster->SetNumberOfLevels(3); @@ -382,7 +382,7 @@ int main(int, char** ) rooster->SetBackProjectionFilter( ROOSTERFilterType::BP_VOXELBASED ); rooster->SetForwardProjectionFilter( ROOSTERFilterType::FP_JOSEPH ); - + rooster->SetPerformPositivity(true); rooster->SetPerformMotionMask(true); rooster->SetMotionMask(roi->GetOutput()); @@ -392,7 +392,7 @@ int main(int, char** ) rooster->SetPerformL0TemporalDenoising(false); rooster->SetPerformWarping(false); rooster->SetComputeInverseWarpingByConjugateGradient(false); - + TRY_AND_EXIT_ON_ITK_EXCEPTION( rooster->Update() ); CheckImageQuality(rooster->GetOutput(), join->GetOutput(), 0.25, 15, 2.0); @@ -423,7 +423,7 @@ int main(int, char** ) rooster->SetBackProjectionFilter( ROOSTERFilterType::BP_VOXELBASED ); rooster->SetForwardProjectionFilter( ROOSTERFilterType::FP_JOSEPH ); - + rooster->SetPerformPositivity(false); rooster->SetPerformMotionMask(true); rooster->SetMotionMask(roi->GetOutput()); @@ -436,7 +436,7 @@ int main(int, char** ) rooster->SetComputeInverseWarpingByConjugateGradient(false); rooster->SetInverseDisplacementField(inverseDeformationField); rooster->SetUseNearestNeighborInterpolationInWarping(false); - + TRY_AND_EXIT_ON_ITK_EXCEPTION( rooster->Update() ); CheckImageQuality(rooster->GetOutput(), join->GetOutput(), 0.25, 15, 2.0); @@ -447,7 +447,7 @@ int main(int, char** ) rooster->SetBackProjectionFilter( ROOSTERFilterType::BP_CUDAVOXELBASED ); // Cuda voxel based rooster->SetForwardProjectionFilter( ROOSTERFilterType::FP_CUDARAYCAST ); // Cuda ray cast - + rooster->SetPerformPositivity(false); rooster->SetPerformMotionMask(false); rooster->SetPerformTVSpatialDenoising(false); @@ -457,7 +457,7 @@ int main(int, char** ) rooster->SetPerformWarping(false); rooster->SetComputeInverseWarpingByConjugateGradient(false); rooster->SetUseNearestNeighborInterpolationInWarping(false); - + TRY_AND_EXIT_ON_ITK_EXCEPTION( rooster->Update() ); CheckImageQuality(rooster->GetOutput(), join->GetOutput(), 0.25, 15, 2.0); diff --git a/test/rtkfovtest.cxx b/test/rtkfovtest.cxx index 13ba46193..0baf83929 100644 --- a/test/rtkfovtest.cxx +++ b/test/rtkfovtest.cxx @@ -58,7 +58,7 @@ int main(int , char** ) spacing[2] = 2.; #endif - + fovInput->SetOrigin( origin ); fovInput->SetSpacing( spacing ); fovInput->SetSize( size ); @@ -144,6 +144,6 @@ int main(int , char** ) CheckImageQuality(fov->GetOutput(), threshold->GetOutput(), 0.02, 23.5, 2.0); std::cout << "\n\nTest PASSED! " << std::endl; - + return EXIT_SUCCESS; } diff --git a/test/rtkgaincorrectiontest.cxx b/test/rtkgaincorrectiontest.cxx index c00991e6e..9b081b25b 100644 --- a/test/rtkgaincorrectiontest.cxx +++ b/test/rtkgaincorrectiontest.cxx @@ -81,7 +81,7 @@ InputImageType::Pointer createDarkImage() itk::ImageRegionIteratorWithIndex itIn(darkImage, darkImage->GetLargestPossibleRegion()); itIn.GoToBegin(); - while (!itIn.IsAtEnd()) + while (!itIn.IsAtEnd()) { InputImageType::IndexType idx = itIn.GetIndex(); float xx = static_cast(idx[0]) + orig_x; @@ -159,7 +159,7 @@ InputImageType::Pointer createInputImage() inputImage->SetSpacing(spacing); inputImage->Allocate(); inputImage->FillBuffer(32000.0f); - + return inputImage; } @@ -214,7 +214,7 @@ OutputImageType::Pointer generateExpectedOutput(InputImageType::Pointer inputIma float correctedValue = 0.f; float powValue = static_cast(px); for (int m = 0; m < modelOrder; ++m) - { + { int gainidx = m*sizeI2 + j*sizeI + i; float Aij = gainBuffer[gainidx]; correctedValue += Aij *powValue; @@ -251,21 +251,21 @@ int main(int , char** ) gainfilter->SetGainCoefficients(gainImage); gainfilter->SetK(K); - + InputImageType::Pointer testImage = createInputImage(); gainfilter->SetInput(testImage); - + // Apply correction TRY_AND_EXIT_ON_ITK_EXCEPTION(gainfilter->Update()) OutputImageType::Pointer outputImage = gainfilter->GetOutput(); - + // Generate expected output OutputImageType::Pointer expectedOutput = generateExpectedOutput(testImage, K, darkImage, gainImage); - + // Compare itk::ImageRegionConstIterator itExp(expectedOutput, expectedOutput->GetLargestPossibleRegion()); itk::ImageRegionConstIterator itOut(outputImage, outputImage->GetLargestPossibleRegion()); - + itExp.GoToBegin(); itOut.GoToBegin(); float diffValue = 0.f; @@ -282,7 +282,7 @@ int main(int , char** ) std::cerr << "Test Failed! "<< std::endl; exit(EXIT_FAILURE); } - + std::cout << "\n\nTest PASSED! " << std::endl; return EXIT_SUCCESS; diff --git a/test/rtkheadertestfooter.cxx b/test/rtkheadertestfooter.cxx index 6bf97a5d0..d7605b29d 100644 --- a/test/rtkheadertestfooter.cxx +++ b/test/rtkheadertestfooter.cxx @@ -10,7 +10,7 @@ */ int main(int , char**) -{ +{ std::cout << "\n\nTest PASSED! " << std::endl; return EXIT_SUCCESS; } diff --git a/test/rtkinterpolatesplatadjointtest.cxx b/test/rtkinterpolatesplatadjointtest.cxx index b8107e3ed..53bb0e284 100644 --- a/test/rtkinterpolatesplatadjointtest.cxx +++ b/test/rtkinterpolatesplatadjointtest.cxx @@ -59,7 +59,7 @@ int main(int argc, char*argv[]) typedef rtk::ConstantImageSource< VolumeSeriesType > ConstantVolumeSeriesSourceType; ConstantVolumeSeriesSourceType::Pointer constantVolumeSeriesSource = ConstantVolumeSeriesSourceType::New(); - + // Volume metadata VolumeSeriesType::PointType fourDOrigin; VolumeSeriesType::SizeType fourDSize; diff --git a/test/rtklaplaciantest.cxx b/test/rtklaplaciantest.cxx index c81908c7e..cae26b5b9 100644 --- a/test/rtklaplaciantest.cxx +++ b/test/rtklaplaciantest.cxx @@ -78,14 +78,14 @@ int main(int argc, char*argv[]) dsl->InPlaceOff(); TRY_AND_EXIT_ON_ITK_EXCEPTION( dsl->Update() ); - + // Read a reference image typedef itk::ImageFileReader ReaderType; ReaderType::Pointer readerRef = ReaderType::New(); readerRef->SetFileName(argv[1]); TRY_AND_EXIT_ON_ITK_EXCEPTION(readerRef->Update()); - - + + std::cout << "\n\n****** Case 1: CPU laplacian ******" << std::endl; // Create and set the laplacian filter @@ -117,6 +117,6 @@ int main(int argc, char*argv[]) std::cout << "\n\nTest PASSED! " << std::endl; #endif - + return EXIT_SUCCESS; } diff --git a/test/rtkrampfiltertest2.cxx b/test/rtkrampfiltertest2.cxx index 5bfeb61a7..3e4fdf949 100644 --- a/test/rtkrampfiltertest2.cxx +++ b/test/rtkrampfiltertest2.cxx @@ -41,18 +41,18 @@ int main(int , char** ) RampFilterType::Pointer rampFilter = RampFilterType::New(); rampFilter->SetInput(image); - + try { rampFilter->Update(); } - catch( itk::ExceptionObject & err ) - { - std::cerr << err << std::endl; - exit(EXIT_FAILURE); + catch( itk::ExceptionObject & err ) + { + std::cerr << err << std::endl; + exit(EXIT_FAILURE); } - - + + // Check the results ImageType::IndexType index; index[0] = 3; @@ -62,7 +62,7 @@ int main(int , char** ) float value = 0.132652; if(fabs(rampFilter->GetOutput()->GetPixel(index)-value)>0.000001) { - std::cout << "Output value #0 should be " << value << " found " + std::cout << "Output value #0 should be " << value << " found " << rampFilter->GetOutput()->GetPixel(index) << " instead." << std::endl; return EXIT_FAILURE; } @@ -73,7 +73,7 @@ int main(int , char** ) value = 0.149724; if(fabs(rampFilter->GetOutput()->GetPixel(index)-value)>0.000001) { - std::cout << "Output value #1 should be " << value << " found " + std::cout << "Output value #1 should be " << value << " found " << rampFilter->GetOutput()->GetPixel(index) << " instead." << std::endl; return EXIT_FAILURE; } @@ -84,7 +84,7 @@ int main(int , char** ) value = 0.150181; if(fabs(rampFilter->GetOutput()->GetPixel(index)-value)>0.000001) { - std::cout << "Output value #2 should be " << value << " found " + std::cout << "Output value #2 should be " << value << " found " << rampFilter->GetOutput()->GetPixel(index) << " instead." << std::endl; return EXIT_FAILURE; } diff --git a/test/rtkscatterglarefiltertest.cxx b/test/rtkscatterglarefiltertest.cxx index 3a61877eb..85a02ccdc 100644 --- a/test/rtkscatterglarefiltertest.cxx +++ b/test/rtkscatterglarefiltertest.cxx @@ -116,7 +116,7 @@ int main(int , char** ) std::vector coef; coef.push_back(0.0787f); coef.push_back(106.244f); - + SFilter->SetTruncationCorrection(0.5); SFilter->SetCoefficients(coef); @@ -128,7 +128,7 @@ int main(int , char** ) ImageType::SizeType size = outputI->GetLargestPossibleRegion().GetSize(); itk::ImageRegionConstIterator itO(outputI, outputI->GetLargestPossibleRegion()); itO.GoToBegin(); - + ImageType::IndexType idx; float sumBng = 0.0f; float spikeValueOut = 0.0f; @@ -147,7 +147,7 @@ int main(int , char** ) std::cerr << "Test Failed! "<< std::endl; exit(EXIT_FAILURE); } - + std::cout << "\n\nTest PASSED! " << std::endl; return EXIT_SUCCESS; diff --git a/test/rtktotalvariationtest.cxx b/test/rtktotalvariationtest.cxx index ee2178e1b..f83852f33 100644 --- a/test/rtktotalvariationtest.cxx +++ b/test/rtktotalvariationtest.cxx @@ -33,14 +33,14 @@ void CheckTotalVariation(typename TImage::Pointer before, typename TImage::Point /** * \file rtktotalvariationtest.cxx * - * \brief Tests whether the Total Variation denoising BPDQ filter indeed + * \brief Tests whether the Total Variation denoising BPDQ filter indeed * reduces the total variation of a random image * - * This test generates a random volume and performs TV denoising on this + * This test generates a random volume and performs TV denoising on this * volume. It measures its total variation before and after denoising and - * compares. Note that the TV denoising filter does not minimize TV alone, + * compares. Note that the TV denoising filter does not minimize TV alone, * but TV + a data attachment term (it computes the proximal operator of TV). - * Nevertheless, in most cases, it is expected that the output has + * Nevertheless, in most cases, it is expected that the output has * a lower TV than the input. * * \author Cyril Mory @@ -53,14 +53,14 @@ int main(int, char** ) #ifdef USE_CUDA typedef itk::CudaImage< OutputPixelType, Dimension > OutputImageType; - typedef itk::CudaImage< itk::CovariantVector + typedef itk::CudaImage< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #else typedef itk::Image< OutputPixelType, Dimension > OutputImageType; - typedef itk::Image< itk::CovariantVector + typedef itk::Image< itk::CovariantVector < OutputPixelType, Dimension >, Dimension > GradientOutputImageType; #endif - + // Random image sources typedef itk::RandomImageSource< OutputImageType > RandomImageSourceType; RandomImageSourceType::Pointer randomVolumeSource = RandomImageSourceType::New(); @@ -108,7 +108,7 @@ int main(int, char** ) TVdenoising->SetInput(randomVolumeSource->GetOutput()); TVdenoising->SetNumberOfIterations(100); TVdenoising->SetGamma(0.3); - + bool dimsProcessed[Dimension]; for (unsigned int i=0; iUpdate() ); - + CheckTotalVariation(randomVolumeSource->GetOutput(), TVdenoising->GetOutput()); std::cout << "\n\nTest PASSED! " << std::endl; diff --git a/utilities/ITKCudaCommon/include/itkCudaContextManager.h b/utilities/ITKCudaCommon/include/itkCudaContextManager.h index e35e12cfb..9e1f9dd8a 100644 --- a/utilities/ITKCudaCommon/include/itkCudaContextManager.h +++ b/utilities/ITKCudaCommon/include/itkCudaContextManager.h @@ -41,7 +41,7 @@ class ITKCudaCommon_EXPORT CudaContextManager : public LightObject static CudaContextManager* GetInstance(); static void DestroyInstance(); - + CUcontext* GetCurrentContext(); int GetCurrentDevice(); diff --git a/utilities/ITKCudaCommon/include/itkCudaDataManager.h b/utilities/ITKCudaCommon/include/itkCudaDataManager.h index c08179c52..bf5a81ce6 100644 --- a/utilities/ITKCudaCommon/include/itkCudaDataManager.h +++ b/utilities/ITKCudaCommon/include/itkCudaDataManager.h @@ -132,7 +132,7 @@ class ITKCudaCommon_EXPORT CudaDataManager : public Object /** total buffer size in bytes */ void SetBufferSize(size_t num); - size_t GetBufferSize() + size_t GetBufferSize() { return m_BufferSize; } diff --git a/utilities/ITKCudaCommon/include/itkCudaImageDataManager.h b/utilities/ITKCudaCommon/include/itkCudaImageDataManager.h index afc074a6c..9910f00aa 100644 --- a/utilities/ITKCudaCommon/include/itkCudaImageDataManager.h +++ b/utilities/ITKCudaCommon/include/itkCudaImageDataManager.h @@ -72,7 +72,7 @@ class ITK_EXPORT CudaImageDataManager : public CudaDataManager /** Grafting Cuda Image Data */ virtual void Graft(const CudaDataManager* data); - + protected: CudaImageDataManager() {} virtual ~CudaImageDataManager() {} diff --git a/utilities/ITKCudaCommon/include/itkCudaImageDataManager.hxx b/utilities/ITKCudaCommon/include/itkCudaImageDataManager.hxx index 283c8fc7a..ab6c5ee8a 100644 --- a/utilities/ITKCudaCommon/include/itkCudaImageDataManager.hxx +++ b/utilities/ITKCudaCommon/include/itkCudaImageDataManager.hxx @@ -97,7 +97,7 @@ void CudaImageDataManager< ImageType >::MakeGPUBufferUpToDate() TimeStamp gpu_time_stamp = this->GetTimeStamp(); TimeStamp cpu_time_stamp = m_Image->GetTimeStamp(); - + /* Why we check dirty flag and time stamp together? * Because existing CPU image filters do not use pixel/buffer * access function in CudaImage and therefore dirty flag is not diff --git a/utilities/ITKCudaCommon/include/itkCudaKernelManager.h b/utilities/ITKCudaCommon/include/itkCudaKernelManager.h index a20ba0cbe..ebd9040e4 100644 --- a/utilities/ITKCudaCommon/include/itkCudaKernelManager.h +++ b/utilities/ITKCudaCommon/include/itkCudaKernelManager.h @@ -32,7 +32,7 @@ namespace itk /** \class CudaKernelManager * \brief Cuda kernel manager implemented using Cuda. * - * This class is responsible for managing the Cuda kernel + * This class is responsible for managing the Cuda kernel * * \ingroup ITKCudaCommon */ @@ -58,13 +58,13 @@ class ITKCudaCommon_EXPORT CudaKernelManager : public LightObject bool LoadProgramFromFile(const char* filename); bool LoadProgramFromString(const char* str); - + int CreateKernel(const char* kernelName); int CreateKernel(const char* kernelName, const std::type_info&); - + bool PushKernelArg(int kernelIdx, const void* argVal); - + void ClearKernelArgs(int kernelIdx); bool SetKernelArg(int kernelIdx, int argIdx, size_t argSize, const void* argVal); @@ -76,36 +76,36 @@ class ITKCudaCommon_EXPORT CudaKernelManager : public LightObject { return SetKernelArgWithImage(kernelIdx, argIdx, image->GetCudaDataManager()); } - + /** Pass to Cuda both the pixel buffer and the buffered region. */ template< class TCudaImageDataManager > bool SetKernelArgWithImageAndBufferedRegion( int kernelIdx, int &argIdx, TCudaImageDataManager *manager) { - return SetKernelArgWithImage(kernelIdx, argIdx++, manager) && + return SetKernelArgWithImage(kernelIdx, argIdx++, manager) && SetKernelArgWithImage(kernelIdx, argIdx++, manager->GetGPUBufferedRegionIndex()) && SetKernelArgWithImage(kernelIdx, argIdx++, manager->GetGPUBufferedRegionSize()); } - bool LaunchKernel(int kernelIdx, int dim, - size_t *globalWorkSize, size_t *localWorkSize, + bool LaunchKernel(int kernelIdx, int dim, + size_t *globalWorkSize, size_t *localWorkSize, unsigned int sharedMemBytes = 0); - bool LaunchKernel1D(int kernelIdx, - size_t globalWorkSize, size_t localWorkSize, + bool LaunchKernel1D(int kernelIdx, + size_t globalWorkSize, size_t localWorkSize, unsigned int sharedMemBytes = 0); bool LaunchKernel2D(int kernelIdx, size_t globalWorkSizeX, size_t globalWorkSizeY, - size_t localWorkSizeX, size_t localWorkSizeY, + size_t localWorkSizeX, size_t localWorkSizeY, unsigned int sharedMemBytes = 0); bool LaunchKernel3D(int kernelIdx, size_t globalWorkSizeX, size_t globalWorkSizeY, size_t globalWorkSizeZ, size_t localWorkSizeX, size_t localWorkSizeY, size_t localWorkSizeZ, unsigned int sharedMemBytes = 0); - + void Synchronize(); protected: diff --git a/utilities/ITKCudaCommon/include/itkCudaReduction.h b/utilities/ITKCudaCommon/include/itkCudaReduction.h index add80df5e..92839b5e8 100644 --- a/utilities/ITKCudaCommon/include/itkCudaReduction.h +++ b/utilities/ITKCudaCommon/include/itkCudaReduction.h @@ -65,7 +65,7 @@ class ITK_EXPORT CudaReduction : unsigned int NextPow2(unsigned int x); bool isPow2(unsigned int x); - void GetNumBlocksAndThreads(int whichKernel, int n, + void GetNumBlocksAndThreads(int whichKernel, int n, int maxBlocks, int maxThreads, int &blocks, int &threads); unsigned int GetReductionKernel(int whichKernel, int blockSize, int isPowOf2); diff --git a/utilities/ITKCudaCommon/include/itkCudaUtil.h b/utilities/ITKCudaCommon/include/itkCudaUtil.h index 3db564873..d28d5921a 100644 --- a/utilities/ITKCudaCommon/include/itkCudaUtil.h +++ b/utilities/ITKCudaCommon/include/itkCudaUtil.h @@ -58,7 +58,7 @@ class ITKCudaCommon_EXPORT kernel \ { \ return kernel::GetCudaPTXSource(); \ } - + /** Get the local block size based on the desired Image Dimension * currently set as follows: * Cuda workgroup (block) size for 1/2/3D - needs to be tuned based on the Cuda architecture diff --git a/utilities/ITKCudaCommon/include/itkCudaWin32Header.h b/utilities/ITKCudaCommon/include/itkCudaWin32Header.h index 7879f574c..977413afe 100644 --- a/utilities/ITKCudaCommon/include/itkCudaWin32Header.h +++ b/utilities/ITKCudaCommon/include/itkCudaWin32Header.h @@ -28,7 +28,7 @@ # endif /* ITK_EXPORT */ #else /* unix needs nothing */ -#define ITKCudaCommon_EXPORT +#define ITKCudaCommon_EXPORT #endif #endif diff --git a/utilities/ITKCudaCommon/src/itkCudaKernelManager.cxx b/utilities/ITKCudaCommon/src/itkCudaKernelManager.cxx index 3c19fb796..4768c24bc 100644 --- a/utilities/ITKCudaCommon/src/itkCudaKernelManager.cxx +++ b/utilities/ITKCudaCommon/src/itkCudaKernelManager.cxx @@ -48,14 +48,14 @@ bool CudaKernelManager::LoadProgramFromFile(const char* filename) // CUmodule module; CUresult err = cuModuleLoad(&module, filename); - if (err != CUDA_SUCCESS) + if (err != CUDA_SUCCESS) { itkWarningMacro(<< "Cannot create Cuda program"); return false; } m_Program = module; - + return true; } @@ -75,7 +75,7 @@ bool CudaKernelManager::LoadProgramFromString(const char* str) } m_Program = module; - + return true; } @@ -83,17 +83,17 @@ int CudaKernelManager::CreateKernel(const char* kernelName) { CUfunction func; CUresult errid = cuModuleGetFunction(&func, static_cast(m_Program), kernelName); - if (errid != CUDA_SUCCESS) + if (errid != CUDA_SUCCESS) { itkWarningMacro("Fail to create Cuda kernel " + std::string(kernelName)); return false; } - + m_KernelContainer.push_back(func); // argument list m_KernelArgumentReady.push_back(std::vector< KernelArgumentList >()); - + return (int)m_KernelContainer.size()-1; } @@ -233,7 +233,7 @@ bool CudaKernelManager::LaunchKernel(int kernelIdx, int itkNotUsed(dim), size_t std::vector params; GetKernelParams(kernelIdx, params); - + std::cout << "Kernel " << m_KernelContainer[kernelIdx] << " has " << params.size() << " params" << std::endl; /*for (int i = 0; i < params.size() ;i++) { @@ -244,14 +244,14 @@ bool CudaKernelManager::LaunchKernel(int kernelIdx, int itkNotUsed(dim), size_t std::cout << " localWorkSize: " << localWorkSize[0] << ", " << localWorkSize[1] << ", " << localWorkSize[2] << std::endl; std::cout << "blocks " << GETBLOCKSIZE(globalWorkSize[0], localWorkSize[0]) << ", " << - GETBLOCKSIZE(globalWorkSize[1], localWorkSize[1]) << ", " << + GETBLOCKSIZE(globalWorkSize[1], localWorkSize[1]) << ", " << GETBLOCKSIZE(globalWorkSize[2], localWorkSize[2]) << std::endl; - - CUDA_CHECK(cuLaunchKernel(m_KernelContainer[kernelIdx], - GETBLOCKSIZE(globalWorkSize[0], localWorkSize[0]), + + CUDA_CHECK(cuLaunchKernel(m_KernelContainer[kernelIdx], + GETBLOCKSIZE(globalWorkSize[0], localWorkSize[0]), GETBLOCKSIZE(globalWorkSize[1], localWorkSize[1]), GETBLOCKSIZE(globalWorkSize[2], localWorkSize[2]), - localWorkSize[0], localWorkSize[1], localWorkSize[2], + localWorkSize[0], localWorkSize[1], localWorkSize[2], sharedMemBytes, 0, ¶ms[0], 0)); return true; } diff --git a/utilities/ITKCudaCommon/test/itkCudaImageTest.cxx b/utilities/ITKCudaCommon/test/itkCudaImageTest.cxx index 476aaaa10..e15accea3 100644 --- a/utilities/ITKCudaCommon/test/itkCudaImageTest.cxx +++ b/utilities/ITKCudaCommon/test/itkCudaImageTest.cxx @@ -90,7 +90,7 @@ int itkCudaImageTest(int argc, char *argv[]) kernelManager->LoadProgramFromString(CudaSource.c_str()); int2 imageSize = make_int2(width, height); - + // // create addition kernel // @@ -103,7 +103,7 @@ int itkCudaImageTest(int argc, char *argv[]) std::cout << "SrcA : " << srcA->GetPixel( idx ) << std::endl; std::cout << "SrcB : " << srcB->GetPixel( idx ) << std::endl; std::cout << "Dest : " << dest->GetPixel( idx ) << std::endl; - + kernelManager->SetKernelArg(kernel_add, 0, 1, &imageSize); kernelManager->SetKernelArgWithImage(kernel_add, 1, srcA); kernelManager->SetKernelArgWithImage(kernel_add, 2, srcB); @@ -145,9 +145,9 @@ int itkCudaImageTest(int argc, char *argv[]) std::cout << "SrcB : " << srcB->GetPixel( idx ) << std::endl; std::cout << "Des : " << dest->GetPixel( idx ) << std::endl; std::cout << "======================" << std::endl; - + itk::CudaContextManager *contextManager = itk::CudaContextManager::GetInstance(); - + // // create subtraction kernel // @@ -178,6 +178,6 @@ int itkCudaImageTest(int argc, char *argv[]) std::cout << "SrcB : " << srcB->GetPixel( idx ) << std::endl; std::cout << "Des : " << dest->GetPixel( idx ) << std::endl; std::cout << "======================" << std::endl; - + return EXIT_SUCCESS; } diff --git a/utilities/UploadTestData.py b/utilities/UploadTestData.py index 4132b6355..a2d6fac54 100644 --- a/utilities/UploadTestData.py +++ b/utilities/UploadTestData.py @@ -54,7 +54,7 @@ def _uploadContentLinkItem(self, content_link, test_folder, workDir = os.path.normpath(scriptDir + "/../test/" + test_folder) content_link = os.path.join(workDir, content_link) - + if os.path.isfile(content_link) and \ fnmatch.fnmatch(content_link, '*.sha512'): with open(content_link, 'r') as fp: @@ -63,7 +63,7 @@ def _uploadContentLinkItem(self, content_link, test_folder, content_file = os.path.join(workDir, ".ExternalData_SHA512_" + hash_value) if os.path.isfile(content_file): print("\n Found content file: " + content_file) - + self._uploadAsItem( name, folder['_id'], diff --git a/utilities/gengetopt/CMakeLists.txt b/utilities/gengetopt/CMakeLists.txt index 77736b99f..d77881842 100755 --- a/utilities/gengetopt/CMakeLists.txt +++ b/utilities/gengetopt/CMakeLists.txt @@ -18,7 +18,7 @@ IF(MSVC) ADD_DEFINITIONS(-Disatty=!) ENDIF(MSVC) -ADD_EXECUTABLE(gengetopt +ADD_EXECUTABLE(gengetopt ./cmdline.c ./ggos.cpp ./scanner.cc diff --git a/utilities/gengetopt/Makefile.am b/utilities/gengetopt/Makefile.am index 091008f4b..deacbbd45 100644 --- a/utilities/gengetopt/Makefile.am +++ b/utilities/gengetopt/Makefile.am @@ -1,20 +1,20 @@ # Copyright (C) 1999-2009 Free Software Foundation, Inc. -# -# This file is part of GNU gengetopt # -# GNU gengetopt is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# This file is part of GNU gengetopt # -# GNU gengetopt is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU gengetopt is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU gengetopt is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. +# Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with gengetopt; see the file COPYING. If not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with gengetopt; see the file COPYING. If not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. SUBDIRS = includes skels tests @@ -108,7 +108,7 @@ pkgdata_DATA = gnugetopt.h getopt.c getopt1.c # automake (maybe due to a bug) doesn't added these files well, # so we explicitely declare them -MAINTAINERCLEANFILES = scanner.cc parser.h parser.cc +MAINTAINERCLEANFILES = scanner.cc parser.h parser.cc noinst_HEADERS = acceptedvalues.h errorcodes.h fileutils.h \ gm_utils.h yyerror.h diff --git a/utilities/gengetopt/acceptedvalues.h b/utilities/gengetopt/acceptedvalues.h index d6a3d080f..da4ac673e 100644 --- a/utilities/gengetopt/acceptedvalues.h +++ b/utilities/gengetopt/acceptedvalues.h @@ -26,7 +26,7 @@ class AcceptedValues : protected std::list private: typedef std::set value_set; value_set values; - + public: using std::list::const_iterator; using std::list::begin; diff --git a/utilities/gengetopt/argsdef.c b/utilities/gengetopt/argsdef.c index 4b9af4583..4f925ebff 100644 --- a/utilities/gengetopt/argsdef.c +++ b/utilities/gengetopt/argsdef.c @@ -1,21 +1,21 @@ /** * Copyright (C) 1999-2007 Free Software Foundation, Inc. * - * This file is part of GNU gengetopt + * This file is part of GNU gengetopt * - * GNU gengetopt is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. + * GNU gengetopt is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. * - * GNU gengetopt is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * GNU gengetopt is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. + * Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with gengetopt; see the file COPYING. If not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with gengetopt; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "argsdef.h" diff --git a/utilities/gengetopt/argsdef.h b/utilities/gengetopt/argsdef.h index d296473ff..96e2e2462 100644 --- a/utilities/gengetopt/argsdef.h +++ b/utilities/gengetopt/argsdef.h @@ -1,21 +1,21 @@ /** * Copyright (C) 1999-2007 Free Software Foundation, Inc. * - * This file is part of GNU gengetopt + * This file is part of GNU gengetopt * - * GNU gengetopt is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. + * GNU gengetopt is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. * - * GNU gengetopt is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * GNU gengetopt is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. + * Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with gengetopt; see the file COPYING. If not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with gengetopt; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef GENGETOPT_ARGSDEF_H diff --git a/utilities/gengetopt/cmdline.c b/utilities/gengetopt/cmdline.c index 1e7523c5d..57a7d8f11 100644 --- a/utilities/gengetopt/cmdline.c +++ b/utilities/gengetopt/cmdline.c @@ -118,8 +118,8 @@ init_help_array(void) gengetopt_args_info_help[34] = gengetopt_args_info_detailed_help[40]; gengetopt_args_info_help[35] = gengetopt_args_info_detailed_help[41]; gengetopt_args_info_help[36] = gengetopt_args_info_detailed_help[42]; - gengetopt_args_info_help[37] = 0; - + gengetopt_args_info_help[37] = 0; + } const char *gengetopt_args_info_help[38]; @@ -233,14 +233,14 @@ void clear_args (struct gengetopt_args_info *args_info) args_info->set_package_orig = NULL; args_info->set_version_arg = NULL; args_info->set_version_orig = NULL; - + } static void init_args_info(struct gengetopt_args_info *args_info) { - init_help_array(); + init_help_array(); args_info->help_help = gengetopt_args_info_detailed_help[0] ; args_info->detailed_help_help = gengetopt_args_info_detailed_help[1] ; args_info->version_help = gengetopt_args_info_detailed_help[2] ; @@ -272,7 +272,7 @@ void init_args_info(struct gengetopt_args_info *args_info) args_info->show_full_help_help = gengetopt_args_info_detailed_help[39] ; args_info->show_detailed_help_help = gengetopt_args_info_detailed_help[40] ; args_info->show_version_help = gengetopt_args_info_detailed_help[41] ; - + } void @@ -328,7 +328,7 @@ void cmdline_parser_params_init(struct cmdline_parser_params *params) { if (params) - { + { params->override = 0; params->initialize = 1; params->check_required = 1; @@ -340,9 +340,9 @@ cmdline_parser_params_init(struct cmdline_parser_params *params) struct cmdline_parser_params * cmdline_parser_params_create(void) { - struct cmdline_parser_params *params = + struct cmdline_parser_params *params = (struct cmdline_parser_params *)malloc(sizeof(struct cmdline_parser_params)); - cmdline_parser_params_init(params); + cmdline_parser_params_init(params); return params; } @@ -387,8 +387,8 @@ cmdline_parser_release (struct gengetopt_args_info *args_info) free_string_field (&(args_info->set_package_orig)); free_string_field (&(args_info->set_version_arg)); free_string_field (&(args_info->set_version_orig)); - - + + clear_given (args_info); } @@ -479,7 +479,7 @@ cmdline_parser_dump(FILE *outfile, struct gengetopt_args_info *args_info) write_into_file(outfile, "show-detailed-help", 0, 0 ); if (args_info->show_version_given) write_into_file(outfile, "show-version", 0, 0 ); - + i = EXIT_SUCCESS; return i; @@ -547,7 +547,7 @@ cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, i { int result; struct cmdline_parser_params params; - + params.override = override; params.initialize = initialize; params.check_required = check_required; @@ -590,7 +590,7 @@ static char *package_name = 0; */ static int update_arg(void *field, char **orig_field, - unsigned int *field_given, unsigned int *prev_given, + unsigned int *field_given, unsigned int *prev_given, char *value, const char *possible_values[], const char *default_value, cmdline_parser_arg_type arg_type, @@ -611,18 +611,18 @@ int update_arg(void *field, char **orig_field, if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given))) { if (short_opt != '-') - fprintf (stderr, "%s: `--%s' (`-%c') option given more than once%s\n", + fprintf (stderr, "%s: `--%s' (`-%c') option given more than once%s\n", package_name, long_opt, short_opt, (additional_error ? additional_error : "")); else - fprintf (stderr, "%s: `--%s' option given more than once%s\n", + fprintf (stderr, "%s: `--%s' option given more than once%s\n", package_name, long_opt, (additional_error ? additional_error : "")); return 1; /* failure */ } FIX_UNUSED (default_value); - + if (field_given && *field_given && ! override) return 0; if (prev_given) @@ -679,14 +679,14 @@ cmdline_parser_internal ( int error = 0; struct gengetopt_args_info local_args_info; - + int override; int initialize; int check_required; int check_ambiguity; - + package_name = argv[0]; - + override = params->override; initialize = params->initialize; check_required = params->check_required; @@ -748,9 +748,9 @@ cmdline_parser_internal ( switch (c) { case 'h': /* Print help and exit. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->help_given), &(local_args_info.help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, @@ -759,12 +759,12 @@ cmdline_parser_internal ( goto failure; cmdline_parser_free (&local_args_info); return 0; - + break; case 'V': /* Print version and exit. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->version_given), &(local_args_info.version_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, @@ -773,194 +773,194 @@ cmdline_parser_internal ( goto failure; cmdline_parser_free (&local_args_info); return 0; - + break; case 'i': /* input file (default std input). */ - - - if (update_arg( (void *)&(args_info->input_arg), + + + if (update_arg( (void *)&(args_info->input_arg), &(args_info->input_orig), &(args_info->input_given), &(local_args_info.input_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "input", 'i', additional_error)) goto failure; - + break; case 'f': /* name of generated function. */ - - - if (update_arg( (void *)&(args_info->func_name_arg), + + + if (update_arg( (void *)&(args_info->func_name_arg), &(args_info->func_name_orig), &(args_info->func_name_given), &(local_args_info.func_name_given), optarg, 0, "cmdline_parser", ARG_STRING, check_ambiguity, override, 0, 0, "func-name", 'f', additional_error)) goto failure; - + break; case 'a': /* name of generated args info struct. */ - - - if (update_arg( (void *)&(args_info->arg_struct_name_arg), + + + if (update_arg( (void *)&(args_info->arg_struct_name_arg), &(args_info->arg_struct_name_orig), &(args_info->arg_struct_name_given), &(local_args_info.arg_struct_name_given), optarg, 0, "gengetopt_args_info", ARG_STRING, check_ambiguity, override, 0, 0, "arg-struct-name", 'a', additional_error)) goto failure; - + break; case 'F': /* name of generated file. */ - - - if (update_arg( (void *)&(args_info->file_name_arg), + + + if (update_arg( (void *)&(args_info->file_name_arg), &(args_info->file_name_orig), &(args_info->file_name_given), &(local_args_info.file_name_given), optarg, 0, "cmdline", ARG_STRING, check_ambiguity, override, 0, 0, "file-name", 'F', additional_error)) goto failure; - + break; case 'c': /* extension of c file. */ - - - if (update_arg( (void *)&(args_info->c_extension_arg), + + + if (update_arg( (void *)&(args_info->c_extension_arg), &(args_info->c_extension_orig), &(args_info->c_extension_given), &(local_args_info.c_extension_given), optarg, 0, "c", ARG_STRING, check_ambiguity, override, 0, 0, "c-extension", 'c', additional_error)) goto failure; - + break; case 'H': /* extension of header file. */ - - - if (update_arg( (void *)&(args_info->header_extension_arg), + + + if (update_arg( (void *)&(args_info->header_extension_arg), &(args_info->header_extension_orig), &(args_info->header_extension_given), &(local_args_info.header_extension_given), optarg, 0, "h", ARG_STRING, check_ambiguity, override, 0, 0, "header-extension", 'H', additional_error)) goto failure; - + break; case 'l': /* long usage line in help. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->long_help_given), &(local_args_info.long_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "long-help", 'l', additional_error)) goto failure; - + break; case 'u': /* accept options without names (e.g., file names). */ - - - if (update_arg( (void *)&(args_info->unamed_opts_arg), + + + if (update_arg( (void *)&(args_info->unamed_opts_arg), &(args_info->unamed_opts_orig), &(args_info->unamed_opts_given), &(local_args_info.unamed_opts_given), optarg, 0, "FILES", ARG_STRING, check_ambiguity, override, 0, 0, "unamed-opts", 'u', additional_error)) goto failure; - + break; case 'C': /* generate a config file parser. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->conf_parser_given), &(local_args_info.conf_parser_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "conf-parser", 'C', additional_error)) goto failure; - + break; case 'S': /* generate a string parser (the string contains the command line). */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->string_parser_given), &(local_args_info.string_parser_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "string-parser", 'S', additional_error)) goto failure; - + break; case 'G': /* adds the code for getopt_long in the generated C file. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->include_getopt_given), &(local_args_info.include_getopt_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "include-getopt", 'G', additional_error)) goto failure; - + break; case 'n': /* do not handle --help|-h automatically. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->no_handle_help_given), &(local_args_info.no_handle_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "no-handle-help", 'n', additional_error)) goto failure; - + break; case 'N': /* do not handle --version|-V automatically. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->no_handle_version_given), &(local_args_info.no_handle_version_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "no-handle-version", 'N', additional_error)) goto failure; - + break; case 'e': /* do not exit on errors. */ - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->no_handle_error_given), &(local_args_info.no_handle_error_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "no-handle-error", 'e', additional_error)) goto failure; - + break; case 'g': /* put gengetopt version in the generated file. */ - - + + if (update_arg((void *)&(args_info->gen_version_flag), 0, &(args_info->gen_version_given), &(local_args_info.gen_version_given), optarg, 0, 0, ARG_FLAG, check_ambiguity, override, 1, 0, "gen-version", 'g', additional_error)) goto failure; - + break; case 0: /* Long option with no short option */ /* Print help, including all details and hidden options, and exit. */ if (strcmp (long_options[option_index].name, "detailed-help") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->detailed_help_given), &(local_args_info.detailed_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, @@ -969,191 +969,191 @@ cmdline_parser_internal ( goto failure; cmdline_parser_free (&local_args_info); return 0; - + } /* output directory. */ else if (strcmp (long_options[option_index].name, "output-dir") == 0) { - - - if (update_arg( (void *)&(args_info->output_dir_arg), + + + if (update_arg( (void *)&(args_info->output_dir_arg), &(args_info->output_dir_orig), &(args_info->output_dir_given), &(local_args_info.output_dir_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "output-dir", '-', additional_error)) goto failure; - + } /* header output directory. */ else if (strcmp (long_options[option_index].name, "header-output-dir") == 0) { - - - if (update_arg( (void *)&(args_info->header_output_dir_arg), + + + if (update_arg( (void *)&(args_info->header_output_dir_arg), &(args_info->header_output_dir_orig), &(args_info->header_output_dir_given), &(local_args_info.header_output_dir_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "header-output-dir", '-', additional_error)) goto failure; - + } /* source output directory. */ else if (strcmp (long_options[option_index].name, "src-output-dir") == 0) { - - - if (update_arg( (void *)&(args_info->src_output_dir_arg), + + + if (update_arg( (void *)&(args_info->src_output_dir_arg), &(args_info->src_output_dir_orig), &(args_info->src_output_dir_given), &(local_args_info.src_output_dir_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "src-output-dir", '-', additional_error)) goto failure; - + } /* by default, an option is considered optional if not specified otherwise. */ else if (strcmp (long_options[option_index].name, "default-optional") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->default_optional_given), &(local_args_info.default_optional_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "default-optional", '-', additional_error)) goto failure; - + } /* do not add --help|-h automatically. */ else if (strcmp (long_options[option_index].name, "no-help") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->no_help_given), &(local_args_info.no_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "no-help", '-', additional_error)) goto failure; - + } /* do not add --version|-V automatically. */ else if (strcmp (long_options[option_index].name, "no-version") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->no_version_given), &(local_args_info.no_version_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "no-version", '-', additional_error)) goto failure; - + } /* in the output of help will specify which options are mandatory, by using the optional passed string. */ else if (strcmp (long_options[option_index].name, "show-required") == 0) { - - - if (update_arg( (void *)&(args_info->show_required_arg), + + + if (update_arg( (void *)&(args_info->show_required_arg), &(args_info->show_required_orig), &(args_info->show_required_given), &(local_args_info.show_required_given), optarg, 0, "(mandatory)", ARG_STRING, check_ambiguity, override, 0, 0, "show-required", '-', additional_error)) goto failure; - + } /* set the package name (override package defined in the .ggo file). */ else if (strcmp (long_options[option_index].name, "set-package") == 0) { - - - if (update_arg( (void *)&(args_info->set_package_arg), + + + if (update_arg( (void *)&(args_info->set_package_arg), &(args_info->set_package_orig), &(args_info->set_package_given), &(local_args_info.set_package_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "set-package", '-', additional_error)) goto failure; - + } /* set the version number (override version defined in the .ggo file). */ else if (strcmp (long_options[option_index].name, "set-version") == 0) { - - - if (update_arg( (void *)&(args_info->set_version_arg), + + + if (update_arg( (void *)&(args_info->set_version_arg), &(args_info->set_version_orig), &(args_info->set_version_given), &(local_args_info.set_version_given), optarg, 0, 0, ARG_STRING, check_ambiguity, override, 0, 0, "set-version", '-', additional_error)) goto failure; - + } /* show the output of --help instead of generating code. */ else if (strcmp (long_options[option_index].name, "show-help") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->show_help_given), &(local_args_info.show_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "show-help", '-', additional_error)) goto failure; - + } /* show the output of --full-help (i.e., including hidden options) instead of generating code. */ else if (strcmp (long_options[option_index].name, "show-full-help") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->show_full_help_given), &(local_args_info.show_full_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "show-full-help", '-', additional_error)) goto failure; - + } /* show the output of --detailed-help (i.e., including details and hidden options) instead of generating code. */ else if (strcmp (long_options[option_index].name, "show-detailed-help") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->show_detailed_help_given), &(local_args_info.show_detailed_help_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "show-detailed-help", '-', additional_error)) goto failure; - + } /* show the output of --version instead of generating code. */ else if (strcmp (long_options[option_index].name, "show-version") == 0) { - - - if (update_arg( 0 , + + + if (update_arg( 0 , 0 , &(args_info->show_version_given), &(local_args_info.show_version_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "show-version", '-', additional_error)) goto failure; - + } - + break; case '?': /* Invalid option. */ /* `getopt_long' already printed an error message. */ @@ -1176,7 +1176,7 @@ cmdline_parser_internal ( return 0; failure: - + cmdline_parser_release (&local_args_info); return (EXIT_FAILURE); } @@ -1269,19 +1269,19 @@ cmdline_parser_string_ext(const char *cmdline, struct gengetopt_args_info *args_ char **argv_ptr = 0; int result; unsigned int argc; - + argc = cmdline_parser_create_argv(cmdline, &argv_ptr, prog_name); - + result = cmdline_parser_internal (argc, argv_ptr, args_info, params, 0); - + if (argv_ptr) { free (argv_ptr); } free_cmd_list(); - + return result; } diff --git a/utilities/gengetopt/cmdline.ggo b/utilities/gengetopt/cmdline.ggo index d80ef5a89..e0e3276bf 100644 --- a/utilities/gengetopt/cmdline.ggo +++ b/utilities/gengetopt/cmdline.ggo @@ -111,7 +111,7 @@ control on --help|-h, you should use --ho-help.\n" option "no-help" - "do not add --help|-h automatically" optional details="\nWith this option you can disable the \ -automatic addition of options --help|-h. The programmer \ +automatic addition of options --help|-h. The programmer \ will then be able to add this option in \ the input file and handle it as he sees fit. Notice that \ --no-help will also disable the automatic options \ diff --git a/utilities/gengetopt/cmdline.h b/utilities/gengetopt/cmdline.h index 138ea0aca..a78de4a5e 100644 --- a/utilities/gengetopt/cmdline.h +++ b/utilities/gengetopt/cmdline.h @@ -99,7 +99,7 @@ struct gengetopt_args_info const char *show_full_help_help; /**< @brief show the output of --full-help (i.e., including hidden options) instead of generating code help description. */ const char *show_detailed_help_help; /**< @brief show the output of --detailed-help (i.e., including details and hidden options) instead of generating code help description. */ const char *show_version_help; /**< @brief show the output of --version instead of generating code help description. */ - + unsigned int help_given ; /**< @brief Whether help was given. */ unsigned int detailed_help_given ; /**< @brief Whether detailed-help was given. */ unsigned int version_given ; /**< @brief Whether version was given. */ @@ -223,7 +223,7 @@ void cmdline_parser_print_detailed_help(void); void cmdline_parser_print_version(void); /** - * Initializes all the fields a cmdline_parser_params structure + * Initializes all the fields a cmdline_parser_params structure * to their default values * @param params the structure to initialize */ diff --git a/utilities/gengetopt/errorcodes.h b/utilities/gengetopt/errorcodes.h index c81ded084..b2786d51e 100644 --- a/utilities/gengetopt/errorcodes.h +++ b/utilities/gengetopt/errorcodes.h @@ -1,7 +1,7 @@ // // C++ Interface: errorcodes // -// Description: +// Description: // // // Author: Lorenzo Bettini , (C) 2004 diff --git a/utilities/gengetopt/ggos.h b/utilities/gengetopt/ggos.h index e2c96f54b..8b0baf349 100644 --- a/utilities/gengetopt/ggos.h +++ b/utilities/gengetopt/ggos.h @@ -50,7 +50,7 @@ struct gengetopt_option char *text_before; /**< a possible text specified before this option */ char *text_after; /**< a possible text specified after this option */ - + char *details; /**< possible further details for this option that will be printed only if --detailed-help is specified */ diff --git a/utilities/gengetopt/global_opts.h b/utilities/gengetopt/global_opts.h index 8332c6997..83c95f9fb 100644 --- a/utilities/gengetopt/global_opts.h +++ b/utilities/gengetopt/global_opts.h @@ -1,21 +1,21 @@ /** * Copyright (C) 1999-2007 Free Software Foundation, Inc. * - * This file is part of GNU gengetopt + * This file is part of GNU gengetopt * - * GNU gengetopt is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. + * GNU gengetopt is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. * - * GNU gengetopt is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * GNU gengetopt is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. + * Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with gengetopt; see the file COPYING. If not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with gengetopt; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef GLOBAL_OPTS_H diff --git a/utilities/gengetopt/gm.h b/utilities/gengetopt/gm.h index ffd25db48..948d38ecc 100644 --- a/utilities/gengetopt/gm.h +++ b/utilities/gengetopt/gm.h @@ -158,20 +158,20 @@ class CmdlineParserCreator : public header_gen_class, public c_source_gen_class /** * generate a list of option descriptions that will be printed in the * help output - * + * * @param generate_hidden if true, include also the hidden options * @param generate_details if true, include also the hidden options and * details for options that have them. */ OptionHelpList *generate_help_option_list(bool generate_hidden = false, bool generate_details = false); - + /** * generate the sharing between a list of help string, using the * complete_list as the list with all the strings (both for hidden * options and details, e.g.) and the smaller_list as the list * with less strings - * + * * @param target_array the name of the array to copy to * @param source_array the name of the array to copy from */ @@ -179,7 +179,7 @@ class CmdlineParserCreator : public header_gen_class, public c_source_gen_class unsigned int indent, OptionHelpList *complete_list, OptionHelpList *smaller_list, const std::string &target_array, const std::string &source_array); - + /** * Sets the has_arg_XXX by inspecting all the options types */ diff --git a/utilities/gengetopt/groups.h b/utilities/gengetopt/groups.h index 2b02b24ea..854ae271c 100644 --- a/utilities/gengetopt/groups.h +++ b/utilities/gengetopt/groups.h @@ -1,21 +1,21 @@ /** * Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. * - * This file is part of GNU gengetopt + * This file is part of GNU gengetopt * - * GNU gengetopt is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. + * GNU gengetopt is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. * - * GNU gengetopt is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * GNU gengetopt is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. + * Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with gengetopt; see the file COPYING. If not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with gengetopt; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef GGO_GROUPS_H diff --git a/utilities/gengetopt/parser.cc b/utilities/gengetopt/parser.cc index 8c1bc5315..7f7f1bf45 100644 --- a/utilities/gengetopt/parser.cc +++ b/utilities/gengetopt/parser.cc @@ -2,20 +2,20 @@ /* A Bison parser, made by GNU Bison 2.4.1. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -1801,7 +1801,7 @@ yyparse () std::string current_option_text; if (current_option->text_after) { current_option_text = std::string(current_option->text_after) + (yyvsp[(2) - (2)].str); - current_option->text_after = strdup(current_option_text.c_str()); + current_option->text_after = strdup(current_option_text.c_str()); } else { current_option->text_after = strdup((yyvsp[(2) - (2)].str)); } diff --git a/utilities/gengetopt/parser.h b/utilities/gengetopt/parser.h index 40cd85fae..c9105ce89 100644 --- a/utilities/gengetopt/parser.h +++ b/utilities/gengetopt/parser.h @@ -2,20 +2,20 @@ /* A Bison parser, made by GNU Bison 2.4.1. */ /* Skeleton interface for Bison's Yacc-like parsers in C - + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/utilities/gengetopt/parser.yy b/utilities/gengetopt/parser.yy index d0a60e0ed..0313bcec5 100644 --- a/utilities/gengetopt/parser.yy +++ b/utilities/gengetopt/parser.yy @@ -344,7 +344,7 @@ text std::string current_option_text; if (current_option->text_after) { current_option_text = std::string(current_option->text_after) + $2; - current_option->text_after = strdup(current_option_text.c_str()); + current_option->text_after = strdup(current_option_text.c_str()); } else { current_option->text_after = strdup($2); } diff --git a/utilities/gengetopt/scanner.cc b/utilities/gengetopt/scanner.cc index 328f764de..7ae5bc011 100644 --- a/utilities/gengetopt/scanner.cc +++ b/utilities/gengetopt/scanner.cc @@ -34,7 +34,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -51,7 +51,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -172,7 +172,7 @@ extern FILE *yyin, *yyout; /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -184,7 +184,7 @@ extern FILE *yyin, *yyout; if ( yytext[yyl] == '\n' )\ --yylineno;\ }while(0) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -246,7 +246,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -608,9 +608,9 @@ static yyconst flex_int16_t yy_chk[312] = /* Table of booleans, true if rule could match eol. */ static yyconst flex_int32_t yy_rule_can_match_eol[63] = { 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, }; static yy_state_type yy_last_accepting_state; @@ -770,13 +770,13 @@ static int input (void ); static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; static int *yy_start_stack = NULL; - + static void yy_push_state (int new_state ); - + static void yy_pop_state (void ); - + static int yy_top_state (void ); - + /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #ifdef __ia64__ @@ -884,7 +884,7 @@ YY_DECL yy_state_type yy_current_state; char *yy_cp, *yy_bp; int yy_act; - + #line 71 "../../src/scanner.ll" @@ -966,7 +966,7 @@ YY_DECL int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + yylineno++; ; } @@ -1577,7 +1577,7 @@ static int yy_get_next_buffer (void) { yy_state_type yy_current_state; char *yy_cp; - + yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) @@ -1637,7 +1637,7 @@ static int yy_get_next_buffer (void) { int c; - + *(yy_c_buf_p) = (yy_hold_char); if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) @@ -1699,7 +1699,7 @@ static int yy_get_next_buffer (void) (yy_hold_char) = *++(yy_c_buf_p); if ( c == '\n' ) - + yylineno++; ; @@ -1709,12 +1709,12 @@ static int yy_get_next_buffer (void) /** Immediately switch to a different input stream. * @param input_file A readable stream. - * + * * @note This function does not reset the start condition to @c INITIAL . */ void yyrestart (FILE * input_file ) { - + if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1727,11 +1727,11 @@ static int yy_get_next_buffer (void) /** Switch to a different input buffer. * @param new_buffer The new input buffer. - * + * */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - + /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -1771,13 +1771,13 @@ static void yy_load_buffer_state (void) /** Allocate and initialize an input buffer state. * @param file A readable stream. * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * + * * @return the allocated buffer state. */ YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1800,11 +1800,11 @@ static void yy_load_buffer_state (void) /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() - * + * */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - + if ( ! b ) return; @@ -1820,7 +1820,7 @@ static void yy_load_buffer_state (void) #ifndef __cplusplus extern int isatty (int ); #endif /* __cplusplus */ - + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1829,7 +1829,7 @@ extern int isatty (int ); { int oerrno = errno; - + yy_flush_buffer(b ); b->yy_input_file = file; @@ -1845,13 +1845,13 @@ extern int isatty (int ); } b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * + * */ void yy_flush_buffer (YY_BUFFER_STATE b ) { @@ -1880,7 +1880,7 @@ extern int isatty (int ); * the current state. This function will allocate the stack * if necessary. * @param new_buffer The new state. - * + * */ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) { @@ -1910,7 +1910,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. - * + * */ void yypop_buffer_state (void) { @@ -1934,7 +1934,7 @@ void yypop_buffer_state (void) static void yyensure_buffer_stack (void) { int num_to_alloc; - + if (!(yy_buffer_stack)) { /* First allocation is just for 2 elements, since we don't know if this @@ -1947,7 +1947,7 @@ static void yyensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -1977,13 +1977,13 @@ static void yyensure_buffer_stack (void) /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. + * + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -2012,14 +2012,14 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan - * + * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - + return yy_scan_bytes(yystr,strlen(yystr) ); } @@ -2027,7 +2027,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * + * * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) @@ -2036,7 +2036,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) yyalloc(n ); @@ -2127,16 +2127,16 @@ static void yy_fatal_error (yyconst char* msg ) /* Accessor methods (get/set functions) to struct members. */ /** Get the current line number. - * + * */ int yyget_lineno (void) { - + return yylineno; } /** Get the input stream. - * + * */ FILE *yyget_in (void) { @@ -2144,7 +2144,7 @@ FILE *yyget_in (void) } /** Get the output stream. - * + * */ FILE *yyget_out (void) { @@ -2152,7 +2152,7 @@ FILE *yyget_out (void) } /** Get the length of the current token. - * + * */ int yyget_leng (void) { @@ -2160,7 +2160,7 @@ int yyget_leng (void) } /** Get the current token. - * + * */ char *yyget_text (void) @@ -2170,18 +2170,18 @@ char *yyget_text (void) /** Set the current line number. * @param line_number - * + * */ void yyset_lineno (int line_number ) { - + yylineno = line_number; } /** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. - * + * * @see yy_switch_to_buffer */ void yyset_in (FILE * in_str ) @@ -2212,7 +2212,7 @@ static int yy_init_globals (void) /* We do not touch yylineno unless the option is enabled. */ yylineno = 1; - + (yy_buffer_stack) = 0; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; @@ -2242,7 +2242,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer(YY_CURRENT_BUFFER ); diff --git a/utilities/gengetopt/skels/c_source.cc b/utilities/gengetopt/skels/c_source.cc index 51200839f..dabe5a006 100644 --- a/utilities/gengetopt/skels/c_source.cc +++ b/utilities/gengetopt/skels/c_source.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -4006,8 +4006,8 @@ c_source_gen_class::generate_c_source(ostream &stream, unsigned int indent) stream << indent_str; if (include_getopt) { - - + + } else { diff --git a/utilities/gengetopt/skels/c_source.h b/utilities/gengetopt/skels/c_source.h index abeb115b5..2ef32c723 100644 --- a/utilities/gengetopt/skels/c_source.h +++ b/utilities/gengetopt/skels/c_source.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -88,7 +88,7 @@ class c_source_gen_class check_possible_values (false), check_required_options (false), cmd_list (false), conf_parser (false), do_generate_strdup (false), generate_string_parser (false), handle_question_mark (false), handle_unamed (false), has_arg_double (false), has_arg_enum (false), has_arg_flag (false), has_arg_float (false), has_arg_int (false), has_arg_long (false), has_arg_longdouble (false), has_arg_longlong (false), has_arg_short (false), has_arg_string (false), has_details (false), has_hidden (false), has_modes (false), has_typed_options (false), include_getopt (false), multiple_options (false), multiple_options_all_string (false), multiple_options_string (false), multiple_options_with_default (false), multiple_token_functions (false), no_options (false), no_package (false) { } - + c_source_gen_class(const string &_args_info, const string &_check_modes, bool _check_possible_values, bool _check_required_options, const string &_clear_arg, bool _cmd_list, const string &_command_line, bool _conf_parser, const string &_custom_getopt, const string &_description, const string &_detailed_help_option_print, bool _do_generate_strdup, const string &_file_save_loop, const string &_final_exit, const string &_free, const string &_full_help_option_print, bool _generate_string_parser, const string &_generator_version, const string &_getopt_string, const string &_given_init, const string &_handle_dependencies, const string &_handle_group, const string &_handle_no_short_option, const string &_handle_option, bool _handle_question_mark, const string &_handle_required, bool _handle_unamed, bool _has_arg_double, bool _has_arg_enum, bool _has_arg_flag, bool _has_arg_float, bool _has_arg_int, bool _has_arg_long, bool _has_arg_longdouble, bool _has_arg_longlong, bool _has_arg_short, bool _has_arg_string, bool _has_details, bool _has_hidden, bool _has_modes, bool _has_typed_options, const string &_header_file_ext, const string &_help_option_print, const string &_help_string_num, bool _include_getopt, const string &_init_args_info, const string &_list_def, const string &_list_free, const string &_long_option_struct, const string &_multiple_fill_array, bool _multiple_options, bool _multiple_options_all_string, bool _multiple_options_string, bool _multiple_options_with_default, bool _multiple_token_functions, bool _no_options, bool _no_package, const string &_option_values, const string &_package_var_name, const string &_parser_name, const string &_purpose, const string &_reset_groups, const string &_source_name, const string &_update_multiple_given, const string &_usage_string, const string &_version_var_name) : args_info (_args_info), check_modes (_check_modes), check_possible_values (_check_possible_values), check_required_options (_check_required_options), clear_arg (_clear_arg), cmd_list (_cmd_list), command_line (_command_line), conf_parser (_conf_parser), custom_getopt (_custom_getopt), description (_description), detailed_help_option_print (_detailed_help_option_print), do_generate_strdup (_do_generate_strdup), file_save_loop (_file_save_loop), final_exit (_final_exit), free (_free), full_help_option_print (_full_help_option_print), generate_string_parser (_generate_string_parser), generator_version (_generator_version), getopt_string (_getopt_string), given_init (_given_init), handle_dependencies (_handle_dependencies), handle_group (_handle_group), handle_no_short_option (_handle_no_short_option), handle_option (_handle_option), handle_question_mark (_handle_question_mark), handle_required (_handle_required), handle_unamed (_handle_unamed), has_arg_double (_has_arg_double), has_arg_enum (_has_arg_enum), has_arg_flag (_has_arg_flag), has_arg_float (_has_arg_float), has_arg_int (_has_arg_int), has_arg_long (_has_arg_long), has_arg_longdouble (_has_arg_longdouble), has_arg_longlong (_has_arg_longlong), has_arg_short (_has_arg_short), has_arg_string (_has_arg_string), has_details (_has_details), has_hidden (_has_hidden), has_modes (_has_modes), has_typed_options (_has_typed_options), header_file_ext (_header_file_ext), help_option_print (_help_option_print), help_string_num (_help_string_num), include_getopt (_include_getopt), init_args_info (_init_args_info), list_def (_list_def), list_free (_list_free), long_option_struct (_long_option_struct), multiple_fill_array (_multiple_fill_array), multiple_options (_multiple_options), multiple_options_all_string (_multiple_options_all_string), multiple_options_string (_multiple_options_string), multiple_options_with_default (_multiple_options_with_default), multiple_token_functions (_multiple_token_functions), no_options (_no_options), no_package (_no_package), option_values (_option_values), package_var_name (_package_var_name), parser_name (_parser_name), purpose (_purpose), reset_groups (_reset_groups), source_name (_source_name), update_multiple_given (_update_multiple_given), usage_string (_usage_string), version_var_name (_version_var_name) { @@ -496,7 +496,7 @@ class c_source_gen_class } void generate_c_source(ostream &stream, unsigned int indent = 0); - + }; #endif // C_SOURCE_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/check_modes.cc b/utilities/gengetopt/skels/check_modes.cc index fd197cdb1..b75146170 100644 --- a/utilities/gengetopt/skels/check_modes.cc +++ b/utilities/gengetopt/skels/check_modes.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/check_modes.h b/utilities/gengetopt/skels/check_modes.h index 1ac544954..8cebd148d 100644 --- a/utilities/gengetopt/skels/check_modes.h +++ b/utilities/gengetopt/skels/check_modes.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -27,7 +27,7 @@ class check_modes_gen_class check_modes_gen_class() { } - + check_modes_gen_class(const string &_mode1_given_fields, const string &_mode1_name, const string &_mode1_options, const string &_mode2_given_fields, const string &_mode2_name, const string &_mode2_options) : mode1_given_fields (_mode1_given_fields), mode1_name (_mode1_name), mode1_options (_mode1_options), mode2_given_fields (_mode2_given_fields), mode2_name (_mode2_name), mode2_options (_mode2_options) { @@ -87,7 +87,7 @@ class check_modes_gen_class } void generate_check_modes(ostream &stream, unsigned int indent = 0); - + }; #endif // CHECK_MODES_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/clear_arg.cc b/utilities/gengetopt/skels/clear_arg.cc index 43324d30f..cd6c6fcde 100644 --- a/utilities/gengetopt/skels/clear_arg.cc +++ b/utilities/gengetopt/skels/clear_arg.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/clear_arg.h b/utilities/gengetopt/skels/clear_arg.h index bf4bb1455..61b18675c 100644 --- a/utilities/gengetopt/skels/clear_arg.h +++ b/utilities/gengetopt/skels/clear_arg.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -27,7 +27,7 @@ class clear_arg_gen_class has_arg (false), has_orig (false) { } - + clear_arg_gen_class(bool _has_arg, bool _has_orig, const string &_name, const string &_suffix, const string &_value) : has_arg (_has_arg), has_orig (_has_orig), name (_name), suffix (_suffix), value (_value) { @@ -82,7 +82,7 @@ class clear_arg_gen_class } void generate_clear_arg(ostream &stream, unsigned int indent = 0); - + }; #endif // CLEAR_ARG_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/clear_given.cc b/utilities/gengetopt/skels/clear_given.cc index 3e15732dc..9c412740c 100644 --- a/utilities/gengetopt/skels/clear_given.cc +++ b/utilities/gengetopt/skels/clear_given.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/clear_given.h b/utilities/gengetopt/skels/clear_given.h index 6853b2527..44ab804af 100644 --- a/utilities/gengetopt/skels/clear_given.h +++ b/utilities/gengetopt/skels/clear_given.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class clear_given_gen_class group (false) { } - + clear_given_gen_class(const string &_arg_struct, bool _group, const string &_var_arg) : arg_struct (_arg_struct), group (_group), var_arg (_var_arg) { @@ -70,7 +70,7 @@ class clear_given_gen_class } void generate_clear_given(ostream &stream, unsigned int indent = 0); - + }; #endif // CLEAR_GIVEN_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/copyright.cc b/utilities/gengetopt/skels/copyright.cc index f0f726b24..a81f4f9e0 100644 --- a/utilities/gengetopt/skels/copyright.cc +++ b/utilities/gengetopt/skels/copyright.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/copyright.h b/utilities/gengetopt/skels/copyright.h index 3b07bc83d..c7ec57190 100644 --- a/utilities/gengetopt/skels/copyright.h +++ b/utilities/gengetopt/skels/copyright.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -22,7 +22,7 @@ class copyright_gen_class copyright_gen_class() { } - + copyright_gen_class(const string &_year) : year (_year) { @@ -57,7 +57,7 @@ class copyright_gen_class } void generate_copyright(ostream &stream, unsigned int indent = 0); - + }; #endif // COPYRIGHT_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/custom_getopt_gen.cc b/utilities/gengetopt/skels/custom_getopt_gen.cc index d0ff3ffc3..495f833db 100644 --- a/utilities/gengetopt/skels/custom_getopt_gen.cc +++ b/utilities/gengetopt/skels/custom_getopt_gen.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/custom_getopt_gen.h b/utilities/gengetopt/skels/custom_getopt_gen.h index 0f248347d..501e45b2f 100644 --- a/utilities/gengetopt/skels/custom_getopt_gen.h +++ b/utilities/gengetopt/skels/custom_getopt_gen.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -21,10 +21,10 @@ class custom_getopt_gen_gen_class custom_getopt_gen_gen_class() { } - + void generate_custom_getopt_gen(ostream &stream, unsigned int indent = 0); - + }; #endif // CUSTOM_GETOPT_GEN_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/dependant_option.cc b/utilities/gengetopt/skels/dependant_option.cc index f9396a184..1698e3862 100644 --- a/utilities/gengetopt/skels/dependant_option.cc +++ b/utilities/gengetopt/skels/dependant_option.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/dependant_option.h b/utilities/gengetopt/skels/dependant_option.h index 4a1065631..fd102f19e 100644 --- a/utilities/gengetopt/skels/dependant_option.h +++ b/utilities/gengetopt/skels/dependant_option.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -26,7 +26,7 @@ class dependant_option_gen_class dependant_option_gen_class() { } - + dependant_option_gen_class(const string &_dep_option, const string &_dep_option_descr, const string &_option_descr, const string &_option_var_name, const string &_package_var_name) : dep_option (_dep_option), dep_option_descr (_dep_option_descr), option_descr (_option_descr), option_var_name (_option_var_name), package_var_name (_package_var_name) { @@ -81,7 +81,7 @@ class dependant_option_gen_class } void generate_dependant_option(ostream &stream, unsigned int indent = 0); - + }; #endif // DEPENDANT_OPTION_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/enum_decl.cc b/utilities/gengetopt/skels/enum_decl.cc index 00c940807..fa230d155 100644 --- a/utilities/gengetopt/skels/enum_decl.cc +++ b/utilities/gengetopt/skels/enum_decl.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.2 by Lorenzo Bettini + * gengen 1.4.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/enum_decl.h b/utilities/gengetopt/skels/enum_decl.h index 566f296e3..226751920 100644 --- a/utilities/gengetopt/skels/enum_decl.h +++ b/utilities/gengetopt/skels/enum_decl.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.2 by Lorenzo Bettini + * gengen 1.4.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -23,7 +23,7 @@ class enum_decl_gen_class enum_decl_gen_class() { } - + enum_decl_gen_class(const string &_enum_values, const string &_var_arg) : enum_values (_enum_values), var_arg (_var_arg) { @@ -63,7 +63,7 @@ class enum_decl_gen_class } void generate_enum_decl(ostream &stream, unsigned int indent = 0); - + }; #endif // ENUM_DECL_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/exit_failure.cc b/utilities/gengetopt/skels/exit_failure.cc index 705ea345f..326a55c23 100644 --- a/utilities/gengetopt/skels/exit_failure.cc +++ b/utilities/gengetopt/skels/exit_failure.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/exit_failure.h b/utilities/gengetopt/skels/exit_failure.h index 42bf53c58..988bdcefa 100644 --- a/utilities/gengetopt/skels/exit_failure.h +++ b/utilities/gengetopt/skels/exit_failure.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -24,7 +24,7 @@ class exit_failure_gen_class handle_error (false) { } - + exit_failure_gen_class(bool _handle_error, const string &_parser_name) : handle_error (_handle_error), parser_name (_parser_name) { @@ -64,7 +64,7 @@ class exit_failure_gen_class } void generate_exit_failure(ostream &stream, unsigned int indent = 0); - + }; #endif // EXIT_FAILURE_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/file_save.cc b/utilities/gengetopt/skels/file_save.cc index 44888e6dc..eb9c8a22b 100644 --- a/utilities/gengetopt/skels/file_save.cc +++ b/utilities/gengetopt/skels/file_save.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/file_save.h b/utilities/gengetopt/skels/file_save.h index 81d59e6c6..629dbfea3 100644 --- a/utilities/gengetopt/skels/file_save.h +++ b/utilities/gengetopt/skels/file_save.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class file_save_gen_class file_save_gen_class() { } - + file_save_gen_class(const string &_arg, const string &_given, const string &_opt_name, const string &_values) : arg (_arg), given (_given), opt_name (_opt_name), values (_values) { @@ -75,7 +75,7 @@ class file_save_gen_class } void generate_file_save(ostream &stream, unsigned int indent = 0); - + }; #endif // FILE_SAVE_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/file_save_multiple.cc b/utilities/gengetopt/skels/file_save_multiple.cc index 405be319e..84b8a7c9a 100644 --- a/utilities/gengetopt/skels/file_save_multiple.cc +++ b/utilities/gengetopt/skels/file_save_multiple.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/file_save_multiple.h b/utilities/gengetopt/skels/file_save_multiple.h index 36a8aba48..44e49b18a 100644 --- a/utilities/gengetopt/skels/file_save_multiple.h +++ b/utilities/gengetopt/skels/file_save_multiple.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -26,7 +26,7 @@ class file_save_multiple_gen_class has_arg (false) { } - + file_save_multiple_gen_class(bool _has_arg, const string &_opt_name, const string &_opt_var, const string &_values) : has_arg (_has_arg), opt_name (_opt_name), opt_var (_opt_var), values (_values) { @@ -76,7 +76,7 @@ class file_save_multiple_gen_class } void generate_file_save_multiple(ostream &stream, unsigned int indent = 0); - + }; #endif // FILE_SAVE_MULTIPLE_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/free_list.cc b/utilities/gengetopt/skels/free_list.cc index fef4555c9..a11b7c4b1 100644 --- a/utilities/gengetopt/skels/free_list.cc +++ b/utilities/gengetopt/skels/free_list.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/free_list.h b/utilities/gengetopt/skels/free_list.h index 82f515922..50213226f 100644 --- a/utilities/gengetopt/skels/free_list.h +++ b/utilities/gengetopt/skels/free_list.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -24,7 +24,7 @@ class free_list_gen_class string_list (false) { } - + free_list_gen_class(const string &_list_name, bool _string_list) : list_name (_list_name), string_list (_string_list) { @@ -64,7 +64,7 @@ class free_list_gen_class } void generate_free_list(ostream &stream, unsigned int indent = 0); - + }; #endif // FREE_LIST_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/free_multiple.cc b/utilities/gengetopt/skels/free_multiple.cc index e9403b241..4eb4914c4 100644 --- a/utilities/gengetopt/skels/free_multiple.cc +++ b/utilities/gengetopt/skels/free_multiple.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/free_multiple.h b/utilities/gengetopt/skels/free_multiple.h index 64fe58cd8..1f3f0a883 100644 --- a/utilities/gengetopt/skels/free_multiple.h +++ b/utilities/gengetopt/skels/free_multiple.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class free_multiple_gen_class has_string_type (false) { } - + free_multiple_gen_class(bool _has_string_type, const string &_opt_var, const string &_structure) : has_string_type (_has_string_type), opt_var (_opt_var), structure (_structure) { @@ -70,7 +70,7 @@ class free_multiple_gen_class } void generate_free_multiple(ostream &stream, unsigned int indent = 0); - + }; #endif // FREE_MULTIPLE_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/free_string.cc b/utilities/gengetopt/skels/free_string.cc index 6946f8f26..b35fcf11a 100644 --- a/utilities/gengetopt/skels/free_string.cc +++ b/utilities/gengetopt/skels/free_string.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/free_string.h b/utilities/gengetopt/skels/free_string.h index 762261798..3d34b5612 100644 --- a/utilities/gengetopt/skels/free_string.h +++ b/utilities/gengetopt/skels/free_string.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class free_string_gen_class has_string_type (false) { } - + free_string_gen_class(bool _has_string_type, const string &_opt_var, const string &_structure) : has_string_type (_has_string_type), opt_var (_opt_var), structure (_structure) { @@ -70,7 +70,7 @@ class free_string_gen_class } void generate_free_string(ostream &stream, unsigned int indent = 0); - + }; #endif // FREE_STRING_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/generic_option.cc b/utilities/gengetopt/skels/generic_option.cc index 36166f739..86e72c74d 100644 --- a/utilities/gengetopt/skels/generic_option.cc +++ b/utilities/gengetopt/skels/generic_option.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/generic_option.h b/utilities/gengetopt/skels/generic_option.h index feeed55f1..812062afd 100644 --- a/utilities/gengetopt/skels/generic_option.h +++ b/utilities/gengetopt/skels/generic_option.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -38,7 +38,7 @@ class generic_option_gen_class has_short_option (false), multiple (false), option_has_group (false), option_has_mode (false), option_has_type (false) { } - + generic_option_gen_class(const string &_arg_type, const string &_default_value, const string &_final_instructions, const string &_gen_else, const string &_group_var_name, bool _has_short_option, const string &_long_option, bool _multiple, const string &_option_comment, bool _option_has_group, bool _option_has_mode, bool _option_has_type, const string &_option_var_name, const string &_possible_values, const string &_short_option, const string &_structure) : arg_type (_arg_type), default_value (_default_value), final_instructions (_final_instructions), gen_else (_gen_else), group_var_name (_group_var_name), has_short_option (_has_short_option), long_option (_long_option), multiple (_multiple), option_comment (_option_comment), option_has_group (_option_has_group), option_has_mode (_option_has_mode), option_has_type (_option_has_type), option_var_name (_option_var_name), possible_values (_possible_values), short_option (_short_option), structure (_structure) { @@ -148,7 +148,7 @@ class generic_option_gen_class } void generate_generic_option(ostream &stream, unsigned int indent = 0); - + }; #endif // GENERIC_OPTION_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/given_field.cc b/utilities/gengetopt/skels/given_field.cc index d53b61b3e..9d170e3fc 100644 --- a/utilities/gengetopt/skels/given_field.cc +++ b/utilities/gengetopt/skels/given_field.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/given_field.h b/utilities/gengetopt/skels/given_field.h index e964db69c..78b64dccd 100644 --- a/utilities/gengetopt/skels/given_field.h +++ b/utilities/gengetopt/skels/given_field.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class given_field_gen_class group (false) { } - + given_field_gen_class(const string &_arg_name, bool _group, const string &_long_opt) : arg_name (_arg_name), group (_group), long_opt (_long_opt) { @@ -70,7 +70,7 @@ class given_field_gen_class } void generate_given_field(ostream &stream, unsigned int indent = 0); - + }; #endif // GIVEN_FIELD_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/group_counter.cc b/utilities/gengetopt/skels/group_counter.cc index 4c42adb46..b22e67044 100644 --- a/utilities/gengetopt/skels/group_counter.cc +++ b/utilities/gengetopt/skels/group_counter.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.3 by Lorenzo Bettini + * gengen 1.3 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/group_counter.h b/utilities/gengetopt/skels/group_counter.h index 5cd8f8c21..22e0fb57a 100644 --- a/utilities/gengetopt/skels/group_counter.h +++ b/utilities/gengetopt/skels/group_counter.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.3 by Lorenzo Bettini + * gengen 1.3 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -23,7 +23,7 @@ class group_counter_gen_class group_counter_gen_class() { } - + group_counter_gen_class(const string &_group_name, const string &_name) : group_name (_group_name), name (_name) { @@ -63,7 +63,7 @@ class group_counter_gen_class } void generate_group_counter(ostream &stream, unsigned int indent = 0); - + }; #endif // GROUP_COUNTER_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/group_option.cc b/utilities/gengetopt/skels/group_option.cc index 714aa0160..7b616cbef 100644 --- a/utilities/gengetopt/skels/group_option.cc +++ b/utilities/gengetopt/skels/group_option.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/group_option.h b/utilities/gengetopt/skels/group_option.h index 2f0bd01b3..9f5b52977 100644 --- a/utilities/gengetopt/skels/group_option.h +++ b/utilities/gengetopt/skels/group_option.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -26,7 +26,7 @@ class group_option_gen_class group_option_gen_class() { } - + group_option_gen_class(const string &_Comparison_rule, const string &_group_name, const string &_group_var_name, const string &_number_required, const string &_package_var_name) : Comparison_rule (_Comparison_rule), group_name (_group_name), group_var_name (_group_var_name), number_required (_number_required), package_var_name (_package_var_name) { @@ -81,7 +81,7 @@ class group_option_gen_class } void generate_group_option(ostream &stream, unsigned int indent = 0); - + }; #endif // GROUP_OPTION_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/handle_help.cc b/utilities/gengetopt/skels/handle_help.cc index 0f9d2cd0c..3b49967bd 100644 --- a/utilities/gengetopt/skels/handle_help.cc +++ b/utilities/gengetopt/skels/handle_help.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/handle_help.h b/utilities/gengetopt/skels/handle_help.h index 1759c9f9c..5372b01d6 100644 --- a/utilities/gengetopt/skels/handle_help.h +++ b/utilities/gengetopt/skels/handle_help.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -26,7 +26,7 @@ class handle_help_gen_class detailed_help (false), full_help (false), short_opt (false) { } - + handle_help_gen_class(bool _detailed_help, bool _full_help, const string &_parser_name, bool _short_opt) : detailed_help (_detailed_help), full_help (_full_help), parser_name (_parser_name), short_opt (_short_opt) { @@ -76,7 +76,7 @@ class handle_help_gen_class } void generate_handle_help(ostream &stream, unsigned int indent = 0); - + }; #endif // HANDLE_HELP_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/handle_version.cc b/utilities/gengetopt/skels/handle_version.cc index 1e61456b9..23501cb66 100644 --- a/utilities/gengetopt/skels/handle_version.cc +++ b/utilities/gengetopt/skels/handle_version.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/handle_version.h b/utilities/gengetopt/skels/handle_version.h index c7b2e6dd0..421459d3e 100644 --- a/utilities/gengetopt/skels/handle_version.h +++ b/utilities/gengetopt/skels/handle_version.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4.1 by Lorenzo Bettini + * gengen 1.4.1 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -24,7 +24,7 @@ class handle_version_gen_class short_opt (false) { } - + handle_version_gen_class(const string &_parser_name, bool _short_opt) : parser_name (_parser_name), short_opt (_short_opt) { @@ -64,7 +64,7 @@ class handle_version_gen_class } void generate_handle_version(ostream &stream, unsigned int indent = 0); - + }; #endif // HANDLE_VERSION_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/header.cc b/utilities/gengetopt/skels/header.cc index 92c3d5208..64ef1b80b 100644 --- a/utilities/gengetopt/skels/header.cc +++ b/utilities/gengetopt/skels/header.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4 by Lorenzo Bettini + * gengen 1.4 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/header.h b/utilities/gengetopt/skels/header.h index 19c725aab..b2beb8699 100644 --- a/utilities/gengetopt/skels/header.h +++ b/utilities/gengetopt/skels/header.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.4 by Lorenzo Bettini + * gengen 1.4 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -42,7 +42,7 @@ class header_gen_class generate_config_parser (false), generate_string_parser (false), has_details (false), has_hidden (false) { } - + header_gen_class(const string &_args_info, const string &_enum_types, bool _generate_config_parser, bool _generate_string_parser, const string &_generator_version, const string &_group_counters, bool _has_details, bool _has_hidden, const string &_header_file_ext, const string &_header_file_name, const string &_ifndefname, const string &_mode_counters, const string &_option_arg, const string &_option_given, const string &_option_values_decl, const string &_package_var_name, const string &_package_var_val, const string &_parser_name, const string &_version_var_name, const string &_version_var_val) : args_info (_args_info), enum_types (_enum_types), generate_config_parser (_generate_config_parser), generate_string_parser (_generate_string_parser), generator_version (_generator_version), group_counters (_group_counters), has_details (_has_details), has_hidden (_has_hidden), header_file_ext (_header_file_ext), header_file_name (_header_file_name), ifndefname (_ifndefname), mode_counters (_mode_counters), option_arg (_option_arg), option_given (_option_given), option_values_decl (_option_values_decl), package_var_name (_package_var_name), package_var_val (_package_var_val), parser_name (_parser_name), version_var_name (_version_var_name), version_var_val (_version_var_val) { @@ -188,7 +188,7 @@ class header_gen_class } void generate_header(ostream &stream, unsigned int indent = 0); - + }; #endif // HEADER_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/init_args_info.cc b/utilities/gengetopt/skels/init_args_info.cc index 1b59bed81..ce0355f88 100644 --- a/utilities/gengetopt/skels/init_args_info.cc +++ b/utilities/gengetopt/skels/init_args_info.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/init_args_info.h b/utilities/gengetopt/skels/init_args_info.h index d4fdcce7c..0abf2d0ff 100644 --- a/utilities/gengetopt/skels/init_args_info.h +++ b/utilities/gengetopt/skels/init_args_info.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -28,7 +28,7 @@ class init_args_info_gen_class multiple (false) { } - + init_args_info_gen_class(const string &_help_strings, const string &_max, const string &_min, bool _multiple, const string &_num, const string &_var_arg) : help_strings (_help_strings), max (_max), min (_min), multiple (_multiple), num (_num), var_arg (_var_arg) { @@ -88,7 +88,7 @@ class init_args_info_gen_class } void generate_init_args_info(ostream &stream, unsigned int indent = 0); - + }; #endif // INIT_ARGS_INFO_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/multiple_fill_array.cc b/utilities/gengetopt/skels/multiple_fill_array.cc index ab5f06fdd..00715c782 100644 --- a/utilities/gengetopt/skels/multiple_fill_array.cc +++ b/utilities/gengetopt/skels/multiple_fill_array.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/multiple_fill_array.h b/utilities/gengetopt/skels/multiple_fill_array.h index 9249fd56c..73049af9b 100644 --- a/utilities/gengetopt/skels/multiple_fill_array.h +++ b/utilities/gengetopt/skels/multiple_fill_array.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -25,7 +25,7 @@ class multiple_fill_array_gen_class multiple_fill_array_gen_class() { } - + multiple_fill_array_gen_class(const string &_arg_type, const string &_default_value, const string &_option_var_name, const string &_type) : arg_type (_arg_type), default_value (_default_value), option_var_name (_option_var_name), type (_type) { @@ -75,7 +75,7 @@ class multiple_fill_array_gen_class } void generate_multiple_fill_array(ostream &stream, unsigned int indent = 0); - + }; #endif // MULTIPLE_FILL_ARRAY_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/multiple_opt_list.cc b/utilities/gengetopt/skels/multiple_opt_list.cc index f8b6acd76..7aa76e154 100644 --- a/utilities/gengetopt/skels/multiple_opt_list.cc +++ b/utilities/gengetopt/skels/multiple_opt_list.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/multiple_opt_list.h b/utilities/gengetopt/skels/multiple_opt_list.h index ee0e214eb..fe5fa5a3f 100644 --- a/utilities/gengetopt/skels/multiple_opt_list.h +++ b/utilities/gengetopt/skels/multiple_opt_list.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -22,7 +22,7 @@ class multiple_opt_list_gen_class multiple_opt_list_gen_class() { } - + multiple_opt_list_gen_class(const string &_arg_name) : arg_name (_arg_name) { @@ -57,7 +57,7 @@ class multiple_opt_list_gen_class } void generate_multiple_opt_list(ostream &stream, unsigned int indent = 0); - + }; #endif // MULTIPLE_OPT_LIST_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/option_arg.cc b/utilities/gengetopt/skels/option_arg.cc index 5b02e04c0..34b2ce137 100644 --- a/utilities/gengetopt/skels/option_arg.cc +++ b/utilities/gengetopt/skels/option_arg.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.3 by Lorenzo Bettini + * gengen 1.3 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/option_arg.h b/utilities/gengetopt/skels/option_arg.h index e443b79d7..359fd7c45 100644 --- a/utilities/gengetopt/skels/option_arg.h +++ b/utilities/gengetopt/skels/option_arg.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.3 by Lorenzo Bettini + * gengen 1.3 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -35,7 +35,7 @@ class option_arg_gen_class default_on (false), flag_arg (false), has_arg (false), has_default (false), has_enum (false), long_long_arg (false), multiple (false) { } - + option_arg_gen_class(bool _default_on, const string &_default_value, const string &_desc, bool _flag_arg, bool _has_arg, bool _has_default, bool _has_enum, bool _long_long_arg, const string &_longtype, bool _multiple, const string &_name, const string &_origtype, const string &_type) : default_on (_default_on), default_value (_default_value), desc (_desc), flag_arg (_flag_arg), has_arg (_has_arg), has_default (_has_default), has_enum (_has_enum), long_long_arg (_long_long_arg), longtype (_longtype), multiple (_multiple), name (_name), origtype (_origtype), type (_type) { @@ -130,7 +130,7 @@ class option_arg_gen_class } void generate_option_arg(ostream &stream, unsigned int indent = 0); - + }; #endif // OPTION_ARG_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/print_help_string.cc b/utilities/gengetopt/skels/print_help_string.cc index 9eaa51433..123ac12a2 100644 --- a/utilities/gengetopt/skels/print_help_string.cc +++ b/utilities/gengetopt/skels/print_help_string.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/print_help_string.h b/utilities/gengetopt/skels/print_help_string.h index 5179816c3..754029ae8 100644 --- a/utilities/gengetopt/skels/print_help_string.h +++ b/utilities/gengetopt/skels/print_help_string.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -29,7 +29,7 @@ class print_help_string_gen_class last (false), shared (false) { } - + print_help_string_gen_class(const string &_from, const string &_full_index, const string &_helpstring, const string &_index, bool _last, bool _shared, const string &_target) : from (_from), full_index (_full_index), helpstring (_helpstring), index (_index), last (_last), shared (_shared), target (_target) { @@ -94,7 +94,7 @@ class print_help_string_gen_class } void generate_print_help_string(ostream &stream, unsigned int indent = 0); - + }; #endif // PRINT_HELP_STRING_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/required_option.cc b/utilities/gengetopt/skels/required_option.cc index 864a9e1ec..300cfffbc 100644 --- a/utilities/gengetopt/skels/required_option.cc +++ b/utilities/gengetopt/skels/required_option.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/required_option.h b/utilities/gengetopt/skels/required_option.h index 9a27551d4..9e28372db 100644 --- a/utilities/gengetopt/skels/required_option.h +++ b/utilities/gengetopt/skels/required_option.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -27,7 +27,7 @@ class required_option_gen_class checkrange (false) { } - + required_option_gen_class(bool _checkrange, const string &_mode_condition, const string &_option_descr, const string &_option_var_name, const string &_package_var_name) : checkrange (_checkrange), mode_condition (_mode_condition), option_descr (_option_descr), option_var_name (_option_var_name), package_var_name (_package_var_name) { @@ -82,7 +82,7 @@ class required_option_gen_class } void generate_required_option(ostream &stream, unsigned int indent = 0); - + }; #endif // REQUIRED_OPTION_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/reset_group.cc b/utilities/gengetopt/skels/reset_group.cc index 84497d73d..112a5de4c 100644 --- a/utilities/gengetopt/skels/reset_group.cc +++ b/utilities/gengetopt/skels/reset_group.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/reset_group.h b/utilities/gengetopt/skels/reset_group.h index bf51661d4..7d0b96b7b 100644 --- a/utilities/gengetopt/skels/reset_group.h +++ b/utilities/gengetopt/skels/reset_group.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -24,7 +24,7 @@ class reset_group_gen_class reset_group_gen_class() { } - + reset_group_gen_class(const string &_args_info, const string &_body, const string &_name) : args_info (_args_info), body (_body), name (_name) { @@ -69,7 +69,7 @@ class reset_group_gen_class } void generate_reset_group(ostream &stream, unsigned int indent = 0); - + }; #endif // RESET_GROUP_GEN_CLASS_H diff --git a/utilities/gengetopt/skels/update_given.cc b/utilities/gengetopt/skels/update_given.cc index ed52b4339..c4ad6ec50 100644 --- a/utilities/gengetopt/skels/update_given.cc +++ b/utilities/gengetopt/skels/update_given.cc @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ diff --git a/utilities/gengetopt/skels/update_given.h b/utilities/gengetopt/skels/update_given.h index 29f5c8d73..517d80559 100644 --- a/utilities/gengetopt/skels/update_given.h +++ b/utilities/gengetopt/skels/update_given.h @@ -1,6 +1,6 @@ /* * File automatically generated by - * gengen 1.2 by Lorenzo Bettini + * gengen 1.2 by Lorenzo Bettini * http://www.gnu.org/software/gengen */ @@ -22,7 +22,7 @@ class update_given_gen_class update_given_gen_class() { } - + update_given_gen_class(const string &_option_var_name) : option_var_name (_option_var_name) { @@ -57,7 +57,7 @@ class update_given_gen_class } void generate_update_given(ostream &stream, unsigned int indent = 0); - + }; #endif // UPDATE_GIVEN_GEN_CLASS_H diff --git a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt index 223ede7de..7c8d84f67 100644 --- a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt +++ b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt index 109943587..e1a16bb38 100644 --- a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt +++ b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt @@ -43,7 +43,7 @@ The other updates use either forward or backward sweeps. They tend to generate m Both the F77 and C versions contain extensive comments, method and implementational information as part of the code. -The C version contains a record-based wrapper for the data. Function calls have been simplified by including references to this structure. New maintenance routines enable dynamic instance creation and destruction, and simplifies access to the most frequently used functions. The LUSOL C library is multi-instance and fully re-entrant. All control and output parameters have been given long descriptive names for usability. +The C version contains a record-based wrapper for the data. Function calls have been simplified by including references to this structure. New maintenance routines enable dynamic instance creation and destruction, and simplifies access to the most frequently used functions. The LUSOL C library is multi-instance and fully re-entrant. All control and output parameters have been given long descriptive names for usability. Benefits @@ -67,7 +67,7 @@ For TRP, the current bottleneck is updating the vector containing the largest el For TCP, the heap structure is already efficient, but the dense factors (and the extended searching for acceptable pivots) are unavoidable expenses. -The triangular Solve routines do not take full of advantage of sparse right-hand sides. Gilbert and Peierls have shown how to solve Lx = (sparse b) efficiently if L is stored column-wise. Their approach could therefore be implemented in LUSOL for solves with L and U(transpose). Solves with L(transpose) and U would need a second copy of L and U. +The triangular Solve routines do not take full of advantage of sparse right-hand sides. Gilbert and Peierls have shown how to solve Lx = (sparse b) efficiently if L is stored column-wise. Their approach could therefore be implemented in LUSOL for solves with L and U(transpose). Solves with L(transpose) and U would need a second copy of L and U. Original Reference diff --git a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt index 16ab57e8d..9b5fc6839 100644 --- a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt +++ b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt @@ -1,28 +1,28 @@ README.TXT for LUSOL - Advanced LU solver with enhanced numerical stability options ----------------------------------------------------------------------------------- -LUSOL - pronounced "L-U-SOL" - was developed by Prof. Michael Saunders at the -Stanford (University) Optimization Laboratory over a period of 2 decades of +LUSOL - pronounced "L-U-SOL" - was developed by Prof. Michael Saunders at the +Stanford (University) Optimization Laboratory over a period of 2 decades of progressive improvements. It is a particularly capable matrix factorization system and includes sparsity-preserving column updates and equation solving. It is -therefore particularly well suited to be part of a system to solve tough mathematical +therefore particularly well suited to be part of a system to solve tough mathematical programming problems. Further details can be found in the file "LUSOL-overview.txt." A big step has been made in converting the original Fortran code into a much more easily accessible and modularized system based on ANSI C as part of the release of -lp_solve v5. LUSOL is fully implemented as a "Basis Factorization Package", BFP in +lp_solve v5. LUSOL is fully implemented as a "Basis Factorization Package", BFP in lp_solve and is the BFP of choice for large and complex models, if not all. As part of the conversion to C, processor optimized BLAS functionality has been enabled, and -future enhancements to LUSOL may make increasing use of this, ensuring top performance. +future enhancements to LUSOL may make increasing use of this, ensuring top performance. For the lp_solve release of LUSOL, a stand-alone equation solving system has also been developed. A pre-compiled Windows command-line executable version is included in the -standard distribution of LUSOL. In addition, the program options illustrate several -advanced uses of LUSOL. The equation solving utility features reading of standard -matrix files in the Harwell-Boeing, MatrixMarket and text formats. Sample matrix -models are provided for Harwell-Boeing (.RUA) and MatrixMarket (.mtx). +standard distribution of LUSOL. In addition, the program options illustrate several +advanced uses of LUSOL. The equation solving utility features reading of standard +matrix files in the Harwell-Boeing, MatrixMarket and text formats. Sample matrix +models are provided for Harwell-Boeing (.RUA) and MatrixMarket (.mtx). -The LUSOL code is released under the GNU Lesser General Public Licence. Confer the +The LUSOL code is released under the GNU Lesser General Public Licence. Confer the file "Licence_LGPL.txt" for the full terms of this licence. These terms make lp_solve and LUSOL available and distributable on equal licencing terms. It is expected that LUSOL will have an official repository in the near future, but the LUSOL archive at diff --git a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/lusol7a.c b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/lusol7a.c index f3efccc59..d7c69c60b 100644 --- a/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/lusol7a.c +++ b/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL/lusol7a.c @@ -169,7 +169,7 @@ void LU7ELM(LUSOLrec *LUSOL, int JELM, REAL V[], int *LENL, NFREE = LUSOL->lena-(*LENL)-(*LROW); if(NFREEvLU6L; - + /* Insert into U any nonzeros in the top of v. row ip(klast) will contain the last nonzero in pivotal order. diff --git a/utilities/lp_solve/bfp/lp_BFP1.c b/utilities/lp_solve/bfp/lp_BFP1.c index 71912876c..92ba1a58c 100644 --- a/utilities/lp_solve/bfp/lp_BFP1.c +++ b/utilities/lp_solve/bfp/lp_BFP1.c @@ -18,7 +18,7 @@ MYBOOL BFP_CALLMODEL bfp_compatible(lprec *lp, int bfpversion, int lpversion, in MYBOOL status = FALSE; (void) lpversion; /* unused variable */ - + if((lp != NULL) && (bfpversion == BFPVERSION) && (sizeof(REAL) == sizeofvar)) { #if 0 if(lpversion == MAJORVERSION) /* Forces BFP renewal at lp_solve major version changes */ diff --git a/utilities/lp_solve/bfp/lp_BFP2.c b/utilities/lp_solve/bfp/lp_BFP2.c index 9b1ecc3bb..1c6c3a4dc 100644 --- a/utilities/lp_solve/bfp/lp_BFP2.c +++ b/utilities/lp_solve/bfp/lp_BFP2.c @@ -14,7 +14,7 @@ MYBOOL BFP_CALLMODEL bfp_init(lprec *lp, int size, int delta, const char *option lp->invB = (INVrec *) calloc(1, sizeof(*(lp->invB))); lu = lp->invB; - if((lu == NULL) || + if((lu == NULL) || !lp->bfp_resize(lp, size) || !lp->bfp_restart(lp)) return( FALSE ); diff --git a/utilities/lp_solve/colamd/colamd.c b/utilities/lp_solve/colamd/colamd.c index 4c06c72f3..70431a9b4 100644 --- a/utilities/lp_solve/colamd/colamd.c +++ b/utilities/lp_solve/colamd/colamd.c @@ -32,7 +32,7 @@ floating point operations than A. Symamd constructs a matrix M such that M'M has the same nonzero pattern of A, and then orders the columns of M using colmmd. The column ordering of M is then returned as the - row and column ordering P of A. + row and column ordering P of A. Authors: @@ -186,7 +186,7 @@ Colamd: rows with more than (knobs [COLAMD_DENSE_ROW] * n_col) entries are removed prior to ordering. Columns with more than (knobs [COLAMD_DENSE_COL] * n_row) entries are removed prior to - ordering, and placed last in the output column ordering. + ordering, and placed last in the output column ordering. Symamd: uses only knobs [COLAMD_DENSE_ROW], which is knobs [0]. Rows and columns with more than (knobs [COLAMD_DENSE_ROW] * n) @@ -219,7 +219,7 @@ (AQ)'AQ=LL' have less fill-in and require fewer floating point operations than factorizing the unpermuted matrix A or A'A, respectively. - + Returns: TRUE (1) if successful, FALSE (0) otherwise. @@ -250,7 +250,7 @@ Alen >= colamd_recommended (nnz, n_row, n_col) - or equivalently as a C preprocessor macro: + or equivalently as a C preprocessor macro: Alen >= COLAMD_RECOMMENDED (nnz, n_row, n_col) @@ -454,7 +454,7 @@ held in A [(p [c]) ... (p [c+1]-1)]. The row indices in a given column c need not be in ascending order, and duplicate row indices may be present. However, symamd will run faster - if the columns are in sorted order with no duplicate entries. + if the columns are in sorted order with no duplicate entries. The matrix is 0-based. That is, rows are in the range 0 to n-1, and columns are in the range 0 to n-1. Symamd @@ -496,7 +496,7 @@ Symamd returns FALSE if stats is not present. stats [0]: number of dense or empty row and columns ignored - (and ordered last in the output permutation + (and ordered last in the output permutation perm). Note that a row/column can become "empty" if it contains only "dense" and/or "empty" columns/rows. @@ -703,7 +703,7 @@ #define ONES_COMPLEMENT(r) (-(r)-1) /* -------------------------------------------------------------------------- */ -/* Change for version 2.1: define TRUE and FALSE only if not yet defined */ +/* Change for version 2.1: define TRUE and FALSE only if not yet defined */ /* -------------------------------------------------------------------------- */ #ifndef TRUE @@ -960,7 +960,7 @@ PUBLIC int colamd_recommended /* returns recommended value of Alen. */ int n_col /* number of columns in A */ ) { - return (COLAMD_RECOMMENDED (nnz, n_row, n_col)) ; + return (COLAMD_RECOMMENDED (nnz, n_row, n_col)) ; } @@ -1041,7 +1041,7 @@ PUBLIC int symamd /* return TRUE if OK, FALSE otherwise */ int nnz ; /* number of entries in A */ int i ; /* row index of A */ int j ; /* column index of A */ - int k ; /* row index of M */ + int k ; /* row index of M */ int mnz ; /* number of nonzeros in M */ int pp ; /* index into a column of A */ int last_row ; /* last row seen in the current column */ @@ -1508,7 +1508,7 @@ PUBLIC int colamd /* returns TRUE if successful, FALSE otherwise*/ stats [COLAMD_DENSE_ROW] = n_row - n_row2 ; stats [COLAMD_DENSE_COL] = n_col - n_col2 ; stats [COLAMD_DEFRAG_COUNT] = ngarbage ; - DEBUG0 (("colamd: done.\n")) ; + DEBUG0 (("colamd: done.\n")) ; return (TRUE) ; } @@ -1570,7 +1570,7 @@ PRIVATE int init_rows_cols /* returns TRUE if OK, or FALSE otherwise */ Colamd_Col Col [], /* of size n_col+1 */ int A [], /* row indices of A, of size Alen */ int p [], /* pointers to columns in A, of size n_col+1 */ - int stats [COLAMD_STATS] /* colamd statistics */ + int stats [COLAMD_STATS] /* colamd statistics */ ) { /* === Local variables ================================================== */ diff --git a/utilities/lp_solve/lp_MDO.c b/utilities/lp_solve/lp_MDO.c index 12172298e..70f060e7e 100644 --- a/utilities/lp_solve/lp_MDO.c +++ b/utilities/lp_solve/lp_MDO.c @@ -1,21 +1,21 @@ /* Minimum matrix inverse fill-in modules - interface for lp_solve v5.0+ ---------------------------------------------------------------------------------- - Author: Kjell Eikland - Contact: kjell.eikland@broadpark.no + Author: Kjell Eikland + Contact: kjell.eikland@broadpark.no License terms: LGPL. - + Requires: string.h, colamd.h, lp_lib.h Release notes: - v1.0 1 September 2003 Preprocessing routines for minimum fill-in column - ordering for inverse factorization using the open + v1.0 1 September 2003 Preprocessing routines for minimum fill-in column + ordering for inverse factorization using the open source COLAMD library. Suitable for the dense parts - of both the product form and LU factorization inverse + of both the product form and LU factorization inverse methods. - v1.1 1 July 2004 Renamed from lp_colamdMDO to lp_MDO. + v1.1 1 July 2004 Renamed from lp_colamdMDO to lp_MDO. - ---------------------------------------------------------------------------------- + ---------------------------------------------------------------------------------- */ #include @@ -38,7 +38,7 @@ STATIC MYBOOL includeMDO(MYBOOL *usedpos, int item) /* Handle case where we are processing all columns */ if(usedpos == NULL) return( TRUE ); - + else { /* Otherwise do the selective case */ MYBOOL test = usedpos[item]; @@ -53,8 +53,8 @@ STATIC MYBOOL includeMDO(MYBOOL *usedpos, int item) STATIC int prepareMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *data, int *rowmap) /* This routine prepares data structures for colamd(). It is called twice, the first - time to count applicable non-zero elements by column, and the second time to fill in - the row indexes of the non-zero values from the first call. Note that the colamd() + time to count applicable non-zero elements by column, and the second time to fill in + the row indexes of the non-zero values from the first call. Note that the colamd() row index base is 0 (which suits lp_solve fine). */ { int i, ii, j, k, kk; @@ -103,14 +103,14 @@ STATIC int prepareMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *data, int Bnz++; } /* Loop over all NZ-variables */ - for(; i < ii; + for(; i < ii; i++, value += matValueStep, rownr += matRowColStep) { if(!includeMDO(usedpos, *rownr)) continue; /* See if we need to change phase 1 OF value */ if(*rownr == 0) { hold = *value; - if(!modifyOF1(lp, kk, &hold, 1.0)) + if(!modifyOF1(lp, kk, &hold, 1.0)) continue; } /* Tally uneliminated constraint row values */ @@ -164,14 +164,14 @@ int __WINAPI getMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *size, MYBOOL int stats[COLAMD_STATS]; double knobs[COLAMD_KNOBS]; - /* Tally the non-zero counts of the unused columns/rows of the + /* Tally the non-zero counts of the unused columns/rows of the basis matrix and store corresponding "net" starting positions */ allocINT(lp, &col_end, ncols+1, FALSE); n = prepareMDO(lp, usedpos, colorder, col_end, NULL); Bnz = col_end[ncols]; - /* Check that we have unused basic columns, otherwise skip analysis */ - if(ncols == 0 || Bnz == 0) + /* Check that we have unused basic columns, otherwise skip analysis */ + if(ncols == 0 || Bnz == 0) goto Transfer; /* Get net number of rows and fill mapper */ @@ -180,7 +180,7 @@ int __WINAPI getMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *size, MYBOOL for(i = 0; i <= lp->rows; i++) { row_map[i] = i-nrows; /* Increment eliminated row counter if necessary */ - if(!includeMDO(usedpos, i)) + if(!includeMDO(usedpos, i)) nrows++; } nrows = lp->rows+1 - nrows; @@ -197,7 +197,7 @@ int __WINAPI getMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *size, MYBOOL #if 1 colamd_set_defaults(knobs); knobs [COLAMD_DENSE_ROW] = 0.2+0.2 ; /* default changed for UMFPACK */ - knobs [COLAMD_DENSE_COL] = knobs [COLAMD_DENSE_ROW]; + knobs [COLAMD_DENSE_COL] = knobs [COLAMD_DENSE_ROW]; if(symmetric && (nrows == ncols)) { MEMCOPY(colorder, Brows, ncols + 1); error = !symamd(nrows, colorder, col_end, Brows, knobs, stats, mdo_calloc, mdo_free); @@ -215,7 +215,7 @@ int __WINAPI getMDO(lprec *lp, MYBOOL *usedpos, int *colorder, int *size, MYBOOL /* Transfer the estimated optimal ordering, adjusting for index offsets */ Transfer: - if(error) + if(error) error = stats[COLAMD_STATUS]; else { MEMCOPY(Brows, colorder, ncols + 1); diff --git a/utilities/lp_solve/lp_SOS.h b/utilities/lp_solve/lp_SOS.h index 4ec5c67f2..203acdf17 100644 --- a/utilities/lp_solve/lp_SOS.h +++ b/utilities/lp_solve/lp_SOS.h @@ -96,7 +96,7 @@ MYBOOL SOS_set_marked(SOSgroup *group, int sosindex, int column, MYBOOL asactive MYBOOL SOS_unmark(SOSgroup *group, int sosindex, int column); int SOS_fix_unmarked(SOSgroup *group, int sosindex, int variable, REAL *bound, REAL value, MYBOOL isupper, int *diffcount, DeltaVrec *changelog); -int SOS_fix_list(SOSgroup *group, int sosindex, int variable, REAL *bound, +int SOS_fix_list(SOSgroup *group, int sosindex, int variable, REAL *bound, int *varlist, MYBOOL isleft, DeltaVrec *changelog); int SOS_is_satisfied(SOSgroup *group, int sosindex, REAL *solution); MYBOOL SOS_is_feasible(SOSgroup *group, int sosindex, REAL *solution); diff --git a/utilities/lp_solve/lp_lib.c b/utilities/lp_solve/lp_lib.c index 22de763e8..9ef3de7d4 100644 --- a/utilities/lp_solve/lp_lib.c +++ b/utilities/lp_solve/lp_lib.c @@ -3302,7 +3302,7 @@ MYBOOL __WINAPI str_add_lag_con(lprec *lp, const char *row_string, int con_type, int i; MYBOOL ret = TRUE; REAL *a_row; - const char *p; + const char *p; char *new_p; allocREAL(lp, &a_row, lp->columns + 1, FALSE); diff --git a/utilities/lp_solve/lp_matrix.h b/utilities/lp_solve/lp_matrix.h index 3a1044f99..32d26cdc3 100644 --- a/utilities/lp_solve/lp_matrix.h +++ b/utilities/lp_solve/lp_matrix.h @@ -116,13 +116,13 @@ typedef struct _MATrec int mat_alloc; /* The allocated size for matrix sized structures */ /* Sparse problem matrix storage */ -#if MatrixColAccess==CAM_Record +#if MatrixColAccess==CAM_Record MATitem *col_mat; /* mat_alloc : The sparse data storage */ #else /*MatrixColAccess==CAM_Vector*/ int *col_mat_colnr; int *col_mat_rownr; REAL *col_mat_value; -#endif +#endif int *col_end; /* columns_alloc+1 : col_end[i] is the index of the first element after column i; column[i] is stored in elements col_end[i-1] to col_end[i]-1 */ @@ -231,7 +231,7 @@ STATIC void btran(lprec *lp, REAL *rhsvector, int *nzidx, REAL roundzero); /* Combined equation solution and matrix product for simplex operations */ STATIC MYBOOL fsolve(lprec *lp, int varin, REAL *pcol, int *nzidx, REAL roundzero, REAL ofscalar, MYBOOL prepareupdate); STATIC MYBOOL bsolve(lprec *lp, int row_nr, REAL *rhsvector, int *nzidx, REAL roundzero, REAL ofscalar); -STATIC void bsolve_xA2(lprec *lp, int* coltarget, +STATIC void bsolve_xA2(lprec *lp, int* coltarget, int row_nr1, REAL *vector1, REAL roundzero1, int *nzvector1, int row_nr2, REAL *vector2, REAL roundzero2, int *nzvector2, int roundmode); diff --git a/utilities/lp_solve/lp_presolve.c b/utilities/lp_solve/lp_presolve.c index 812882f1d..073d79de9 100644 --- a/utilities/lp_solve/lp_presolve.c +++ b/utilities/lp_solve/lp_presolve.c @@ -4083,7 +4083,7 @@ STATIC int presolve_coldominance01(presolverec *psdata, NATURAL *nConRemoved, NA /* The current version of this routine eliminates binary variables that are dominated via set coverage or unit knapsack constraints */ { - (void)nConRemoved; + (void)nConRemoved; lprec *lp = psdata->lp; MATrec *mat = lp->matA; NATURAL i, ib, ie, jx, item, item2, @@ -4095,7 +4095,7 @@ STATIC int presolve_coldominance01(presolverec *psdata, NATURAL *nConRemoved, NA *colvalues = NULL, *colobj = NULL; LLrec *sets = NULL; UNIONTYPE QSORTrec *QS = (UNIONTYPE QSORTrec *) calloc(n+1, sizeof(*QS)); - (void)nConRemoved; + (void)nConRemoved; /* Check if we were able to obtain working memory */ if(QS == NULL) diff --git a/utilities/lp_solve/lp_rlp.h b/utilities/lp_solve/lp_rlp.h index 3c8c5042d..23f25b317 100644 --- a/utilities/lp_solve/lp_rlp.h +++ b/utilities/lp_solve/lp_rlp.h @@ -33,7 +33,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -50,7 +50,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; #endif /* ! C99 */ @@ -175,7 +175,7 @@ typedef struct lp_yy_buffer_state *YY_BUFFER_STATE; /* Note: We specifically omit the test for lp_yy_rule_can_match_eol because it requires * access to the local variable lp_yy_act. Since lp_yyless() is a macro, it would break - * existing scanners that call lp_yyless() from OUTSIDE lp_yylex. + * existing scanners that call lp_yyless() from OUTSIDE lp_yylex. * One obvious solution it to make lp_yy_act a global. I tried that, and saw * a 5% performance hit in a non-lp_yylineno scanner, because lp_yy_act is * normally declared as a variable-- so it is not worth it. @@ -187,7 +187,7 @@ typedef struct lp_yy_buffer_state *YY_BUFFER_STATE; if ( lp_yytext[lp_yyl] == '\n' )\ --lp_yylineno;\ }while(0) - + /* Return all but the first "n" matched characters back to the input stream. */ #define lp_yyless(n) \ do \ @@ -249,7 +249,7 @@ struct lp_yy_buffer_state int lp_yy_bs_lineno; /**< The line count. */ int lp_yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -575,7 +575,7 @@ static lp_yyconst flex_int16_t lp_yy_chk[426] = /* Table of booleans, true if rule could match eol. */ static lp_yyconst flex_int32_t lp_yy_rule_can_match_eol[34] = { 0, -0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, +0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; /* The intent behind this definition is that it'll catch @@ -657,7 +657,7 @@ static int lp_yy_init_globals (lp_yyscan_t lp_yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ # define lp_yylval lp_yyg->lp_yylval_r - + int lp_yylex_init (lp_yyscan_t* scanner); int lp_yylex_init_extra (YY_EXTRA_TYPE user_defined,lp_yyscan_t* scanner); @@ -708,7 +708,7 @@ extern int lp_yywrap (lp_yyscan_t lp_yyscanner ); #endif static void lp_yyunput (int c,char *buf_ptr ,lp_yyscan_t lp_yyscanner); - + #ifndef lp_yytext_ptr static void lp_yy_flex_strncpy (char *,lp_yyconst char *,int ,lp_yyscan_t lp_yyscanner); #endif @@ -914,7 +914,7 @@ YY_DECL int lp_yyl; for ( lp_yyl = 0; lp_yyl < lp_yyleng; ++lp_yyl ) if ( lp_yytext[lp_yyl] == '\n' ) - + do{ lp_yylineno++; lp_yycolumn=0; }while(0) @@ -1719,7 +1719,7 @@ static int lp_yy_get_next_buffer (lp_yyscan_t lp_yyscanner) YY_CURRENT_BUFFER_LVALUE->lp_yy_at_bol = (c == '\n'); if ( YY_CURRENT_BUFFER_LVALUE->lp_yy_at_bol ) - + do{ lp_yylineno++; lp_yycolumn=0; }while(0) @@ -1802,7 +1802,7 @@ static void lp_yy_load_buffer_state (lp_yyscan_t lp_yyscanner) YY_BUFFER_STATE lp_yy_create_buffer (FILE * file, int size , lp_yyscan_t lp_yyscanner) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) lp_yyalloc(sizeof( struct lp_yy_buffer_state ) ,lp_yyscanner ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in lp_yy_create_buffer()" ); @@ -1846,7 +1846,7 @@ static void lp_yy_load_buffer_state (lp_yyscan_t lp_yyscanner) #ifndef __cplusplus extern int isatty (int ); #endif /* __cplusplus */ - + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a lp_yyrestart() or at EOF. @@ -1872,7 +1872,7 @@ extern int isatty (int ); } b->lp_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } @@ -1978,7 +1978,7 @@ static void lp_yyensure_buffer_stack (lp_yyscan_t lp_yyscanner) , lp_yyscanner); if ( ! lp_yyg->lp_yy_buffer_stack ) YY_FATAL_ERROR( "out of dynamic memory in lp_yyensure_buffer_stack()" ); - + memset(lp_yyg->lp_yy_buffer_stack, 0, num_to_alloc * sizeof(struct lp_yy_buffer_state*)); lp_yyg->lp_yy_buffer_stack_max = num_to_alloc; @@ -2009,12 +2009,12 @@ static void lp_yyensure_buffer_stack (lp_yyscan_t lp_yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param lp_yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE lp_yy_scan_buffer (char * base, lp_yy_size_t size , lp_yyscan_t lp_yyscanner) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -2050,7 +2050,7 @@ YY_BUFFER_STATE lp_yy_scan_buffer (char * base, lp_yy_size_t size , lp_yyscan_ */ YY_BUFFER_STATE lp_yy_scan_string (lp_yyconst char * lp_yystr , lp_yyscan_t lp_yyscanner) { - + return lp_yy_scan_bytes(lp_yystr,strlen(lp_yystr) ,lp_yyscanner); } @@ -2067,7 +2067,7 @@ YY_BUFFER_STATE lp_yy_scan_bytes (lp_yyconst char * lp_yybytes, int _lp_yybyte char *buf; lp_yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _lp_yybytes_len + 2; buf = (char *) lp_yyalloc(n ,lp_yyscanner ); @@ -2136,10 +2136,10 @@ YY_EXTRA_TYPE lp_yyget_extra (lp_yyscan_t lp_yyscanner) int lp_yyget_lineno (lp_yyscan_t lp_yyscanner) { struct lp_yyguts_t * lp_yyg = (struct lp_yyguts_t*)lp_yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return lp_yylineno; } @@ -2149,10 +2149,10 @@ int lp_yyget_lineno (lp_yyscan_t lp_yyscanner) int lp_yyget_column (lp_yyscan_t lp_yyscanner) { struct lp_yyguts_t * lp_yyg = (struct lp_yyguts_t*)lp_yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return lp_yycolumn; } @@ -2213,8 +2213,8 @@ void lp_yyset_lineno (int line_number , lp_yyscan_t lp_yyscanner) /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - lp_yy_fatal_error( "lp_yyset_lineno called with no buffer" , lp_yyscanner); - + lp_yy_fatal_error( "lp_yyset_lineno called with no buffer" , lp_yyscanner); + lp_yylineno = line_number; } @@ -2228,8 +2228,8 @@ void lp_yyset_column (int column_no , lp_yyscan_t lp_yyscanner) /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - lp_yy_fatal_error( "lp_yyset_column called with no buffer" , lp_yyscanner); - + lp_yy_fatal_error( "lp_yyset_column called with no buffer" , lp_yyscanner); + lp_yycolumn = column_no; } @@ -2331,13 +2331,13 @@ int lp_yylex_init_extra(YY_EXTRA_TYPE lp_yy_user_defined,lp_yyscan_t* ptr_lp_yy_ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in lp_yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_lp_yy_globals,0x00,sizeof(struct lp_yyguts_t)); - + lp_yyset_extra (lp_yy_user_defined, *ptr_lp_yy_globals); - + return lp_yy_init_globals ( *ptr_lp_yy_globals ); } diff --git a/utilities/lp_solve/shared/myblas.c b/utilities/lp_solve/shared/myblas.c index 588e7f851..924129a85 100644 --- a/utilities/lp_solve/shared/myblas.c +++ b/utilities/lp_solve/shared/myblas.c @@ -99,10 +99,10 @@ MYBOOL load_BLAS(const char *libname) BLAS_dswap = (BLAS_dswap_func *) GetProcAddress(hBLAS, BLAS_prec "swap"); BLAS_ddot = (BLAS_ddot_func *) GetProcAddress(hBLAS, BLAS_prec "dot"); BLAS_idamax = (BLAS_idamax_func *) GetProcAddress(hBLAS, "i" BLAS_prec "amax"); -#if 0 +#if 0 BLAS_dload = (BLAS_dload_func *) GetProcAddress(hBLAS, BLAS_prec "load"); BLAS_dnormi = (BLAS_dnormi_func *) GetProcAddress(hBLAS, BLAS_prec "normi"); -#endif +#endif } #else /* First standardize UNIX .SO library name format. */ @@ -133,10 +133,10 @@ MYBOOL load_BLAS(const char *libname) BLAS_dswap = (BLAS_dswap_func *) dlsym(hBLAS, BLAS_prec "swap"); BLAS_ddot = (BLAS_ddot_func *) dlsym(hBLAS, BLAS_prec "dot"); BLAS_idamax = (BLAS_idamax_func *) dlsym(hBLAS, "i" BLAS_prec "amax"); -#if 0 +#if 0 BLAS_dload = (BLAS_dload_func *) dlsym(hBLAS, BLAS_prec "load"); BLAS_dnormi = (BLAS_dnormi_func *) dlsym(hBLAS, BLAS_prec "normi"); -#endif +#endif } #endif #endif @@ -210,7 +210,7 @@ void BLAS_CALLMODEL my_daxpy( int *_n, REAL *_da, REAL *dx, int *_incx, REAL *dy (*yptr) += rda*(*xptr); return; } -#else +#else if (incx==1 && incy==1) goto x20; @@ -366,8 +366,8 @@ void BLAS_CALLMODEL my_dscal (int *_n, REAL *_da, REAL *dx, int *_incx) if (n <= 0) return; - rda = da; - + rda = da; + dx--; /* Optionally do fast pointer arithmetic */ @@ -538,7 +538,7 @@ void BLAS_CALLMODEL my_dswap( int *_n, REAL *dx, int *_incx, REAL *dy, int *_inc } return; } -#else +#else if (incx == incy) { if (incx <= 0) goto x5; @@ -707,7 +707,7 @@ int BLAS_CALLMODEL my_idamax( int *_n, REAL *x, int *_is ) imax = i; } } -#endif +#endif return(imax); } diff --git a/wrapping/itkCudaImageToImageFilter.wrap b/wrapping/itkCudaImageToImageFilter.wrap index 98b30be76..07206fb9a 100644 --- a/wrapping/itkCudaImageToImageFilter.wrap +++ b/wrapping/itkCudaImageToImageFilter.wrap @@ -1,7 +1,7 @@ if(RTK_USE_CUDA) - itk_wrap_class("itk::CudaImageToImageFilter" POINTER) + itk_wrap_class("itk::CudaImageToImageFilter" POINTER) foreach(d ${ITK_WRAP_IMAGE_DIMS}) foreach(t ${WRAP_ITK_REAL}) itk_wrap_template("CI${ITKM_${t}}${d}CI${ITKM_${t}}${d}" diff --git a/wrapping/itkVectorImageRTK.wrap b/wrapping/itkVectorImageRTK.wrap index bd8302881..f6fb66e80 100644 --- a/wrapping/itkVectorImageRTK.wrap +++ b/wrapping/itkVectorImageRTK.wrap @@ -6,7 +6,7 @@ itk_wrap_simple_type("itk::VectorImage< float, 3 >::ConstPointer" "itkVectorImag if (ITK_WRAP_double) - foreach(d 2 3) + foreach(d 2 3) itk_wrap_simple_type_swig_interface("itk::VectorImage< double, ${d] >::ConstPointer" "itkVectorImageD${d]_ConstPointer") itk_wrap_simple_type("itk::VectorImage< double, ${d] >::ConstPointer" "itkVectorImageD${d]_ConstPointer") endforeach() diff --git a/wrapping/rtkBackProjectionImageFilter.wrap b/wrapping/rtkBackProjectionImageFilter.wrap index 98de06569..00fddaef9 100644 --- a/wrapping/rtkBackProjectionImageFilter.wrap +++ b/wrapping/rtkBackProjectionImageFilter.wrap @@ -14,7 +14,7 @@ itk_wrap_class("rtk::BackProjectionImageFilter" POINTER) itk_end_wrap_class() if(RTK_USE_CUDA) - + itk_wrap_class("itk::CudaImageToImageFilter" POINTER) itk_wrap_template("CIF3CIF3BPCIF3CIF3" "itk::CudaImage<${ITKT_F}, 3>, itk::CudaImage<${ITKT_F}, 3>, rtk::BackProjectionImageFilter< itk::CudaImage<${ITKT_F}, 3>, itk::CudaImage<${ITKT_F}, 3> >") diff --git a/wrapping/rtkDisplacedDetectorImageFilter.wrap b/wrapping/rtkDisplacedDetectorImageFilter.wrap index 8adc516c4..6d9d8a6d0 100644 --- a/wrapping/rtkDisplacedDetectorImageFilter.wrap +++ b/wrapping/rtkDisplacedDetectorImageFilter.wrap @@ -4,7 +4,7 @@ endif() itk_wrap_class("rtk::DisplacedDetectorImageFilter" POINTER) itk_wrap_image_filter("${WRAP_ITK_REAL}" 1 3) - + if(RTK_USE_CUDA) foreach(d ${ITK_WRAP_IMAGE_DIMS}) foreach(t ${WRAP_ITK_REAL}) @@ -12,7 +12,7 @@ itk_wrap_class("rtk::DisplacedDetectorImageFilter" POINTER) endforeach() endforeach() endif() - + itk_end_wrap_class() if(RTK_USE_CUDA) diff --git a/wrapping/rtkFDKWeightProjectionFilter.wrap b/wrapping/rtkFDKWeightProjectionFilter.wrap index c85906afd..f0ba902b7 100644 --- a/wrapping/rtkFDKWeightProjectionFilter.wrap +++ b/wrapping/rtkFDKWeightProjectionFilter.wrap @@ -4,7 +4,7 @@ endif() itk_wrap_class("rtk::FDKWeightProjectionFilter" POINTER) #WARNING: Only wrapping one image template because TInputImage == TOutputImage - itk_wrap_image_filter("${WRAP_ITK_REAL}" 1) + itk_wrap_image_filter("${WRAP_ITK_REAL}" 1) if(RTK_USE_CUDA) itk_wrap_template("CIF3CIF3F" "itk::CudaImage<${ITKT_F}, 3>" "itk::CudaImage<${ITKT_F}, 3>" "${ITKT_F}") endif() diff --git a/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap b/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap index 7797b7c41..28c765635 100644 --- a/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap +++ b/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap @@ -1,7 +1,7 @@ itk_wrap_class("rtk::IterativeConeBeamReconstructionFilter" POINTER) #WARNING: Templates can not be defined for both itk::Image and itk::CudaImage. - # The "=" operator for one subclass (rtk::FourDConjugateGradientConeBeamReconstructionFilter) + # The "=" operator for one subclass (rtk::FourDConjugateGradientConeBeamReconstructionFilter) # of this class is only defined for templates of type itk::CudaImage when RTK_USE_CUDA. if(RTK_USE_CUDA) diff --git a/wrapping/rtkLookupTableImageFilter.wrap b/wrapping/rtkLookupTableImageFilter.wrap index 3b773cfbb..8b8889084 100644 --- a/wrapping/rtkLookupTableImageFilter.wrap +++ b/wrapping/rtkLookupTableImageFilter.wrap @@ -48,7 +48,7 @@ itk_end_wrap_class() itk_wrap_class("rtk::LookupTableImageFilter" POINTER) itk_wrap_image_filter_combinations("${WRAP_ITK_INT}" "${WRAP_ITK_REAL}" 2+) - + # Wrap ITK unsigned short missing types -- required by LUTbasedVariableI0RawToAttenuationImageFilter if (NOT ITK_WRAP_unsigned_short) foreach(d ${ITK_WRAP_IMAGE_DIMS}) diff --git a/wrapping/rtkParkerShortScanImageFilter.wrap b/wrapping/rtkParkerShortScanImageFilter.wrap index 71e70c160..a06ac993e 100644 --- a/wrapping/rtkParkerShortScanImageFilter.wrap +++ b/wrapping/rtkParkerShortScanImageFilter.wrap @@ -1,3 +1,3 @@ itk_wrap_class("rtk::ParkerShortScanImageFilter" POINTER) - itk_wrap_image_filter("${WRAP_ITK_REAL}" 1) + itk_wrap_image_filter("${WRAP_ITK_REAL}" 1) itk_end_wrap_class() diff --git a/wrapping/rtkProjectionsReader.wrap b/wrapping/rtkProjectionsReader.wrap index 966fc1209..9f0f8eb7f 100644 --- a/wrapping/rtkProjectionsReader.wrap +++ b/wrapping/rtkProjectionsReader.wrap @@ -2,9 +2,9 @@ itk_wrap_class("rtk::ProjectionsReader" POINTER) # Force uchar image IO UNIQUE(image_types "UC;${WRAP_ITK_REAL}") itk_wrap_image_filter("${image_types}" 1) - - #WARNING: "UC;${WRAP_ITK_REAL}" is too restrictive. - # Types should be similar to vnl wrapped types : + + #WARNING: "UC;${WRAP_ITK_REAL}" is too restrictive. + # Types should be similar to vnl wrapped types : # "D;F;SI;SL;LD;SC;UC;US;UI;UL" #Removing VectorImage<> (VI) and WRAP_ITK_SCALAR itk_end_wrap_class() \ No newline at end of file diff --git a/wrapping/rtkSplatWithKnownWeightsImageFilter.wrap b/wrapping/rtkSplatWithKnownWeightsImageFilter.wrap index 503aa9256..f8e0f25e2 100644 --- a/wrapping/rtkSplatWithKnownWeightsImageFilter.wrap +++ b/wrapping/rtkSplatWithKnownWeightsImageFilter.wrap @@ -1,5 +1,5 @@ if(RTK_USE_CUDA) - + itk_wrap_include(itkCudaImage.h) #----------------------------------------------------------------------------- diff --git a/wrapping/rtkVarianObiRawImageFilter.wrap b/wrapping/rtkVarianObiRawImageFilter.wrap index 7f9ddcf59..eb601c0c2 100644 --- a/wrapping/rtkVarianObiRawImageFilter.wrap +++ b/wrapping/rtkVarianObiRawImageFilter.wrap @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# itk::UnaryFunctorImageFilter, itk::Image, +# itk::UnaryFunctorImageFilter, itk::Image, # rtk::Function::ObiAttenuation> #----------------------------------------------------------------------------- itk_wrap_class("itk::UnaryFunctorImageFilter" POINTER) @@ -7,7 +7,7 @@ itk_wrap_class("itk::UnaryFunctorImageFilter" POINTER) foreach(t ${WRAP_ITK_REAL}) foreach(u ${WRAP_ITK_SCALARS}) itk_wrap_template("I${ITKM_${u}}${d}I${ITKM_${t}}${d}OA${ITKM_${u}}${ITKM_${t}}" "itk::Image<${ITKT_${u}}, ${d}>, itk::Image<${ITKT_${t}}, ${d}>, rtk::Function::ObiAttenuation< ${ITKM_${u}},${ITKM_${t}} >") - endforeach() + endforeach() endforeach() endforeach() itk_end_wrap_class() @@ -23,7 +23,7 @@ itk_wrap_class("rtk::VarianObiRawImageFilter" POINTER) foreach(t ${WRAP_ITK_REAL}) foreach(u ${WRAP_ITK_SCALARS}) itk_wrap_template("I${ITKM_${u}}${d}I${ITKM_${t}}${d}" "itk::Image<${ITKT_${u}}, ${d}>, itk::Image<${ITKT_${t}}, ${d}>") - endforeach() + endforeach() endforeach() endforeach() itk_end_wrap_class()