From: jpr Date: Thu, 31 Mar 2011 16:12:33 +0000 (+0000) Subject: Clean X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=gdcm.git;a=commitdiff_plain;h=4b43cc3729743fcf7632e055cabd3f564d1bbe0b Clean --- diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt index 15ae62f1..5816bcb1 100644 --- a/vtk/CMakeLists.txt +++ b/vtk/CMakeLists.txt @@ -25,19 +25,20 @@ INCLUDE_DIRECTORIES( # Depending on VTK version build more stuff: IF("${VTK_MAJOR_VERSION}" GREATER 4) SET(VTKGDCM_LIB_SRCS - vtkGdcmReader.cxx - vtkGdcmWriter.cxx - vtkImageColorViewer.cxx - vtkImageMapToWindowLevelColors2.cxx - vtkGdcm4DSplitter.cxx + vtkGdcmReader.cxx + vtkGdcmWriter.cxx + vtkImageColorViewer.cxx + vtkImageMapToWindowLevelColors2.cxx + vtkGdcm4DSplitter.cxx ) ELSE("${VTK_MAJOR_VERSION}" GREATER 4) SET(VTKGDCM_LIB_SRCS - vtkGdcmReader.cxx - vtkGdcmWriter.cxx + vtkGdcmReader.cxx + vtkGdcmWriter.cxx ) ENDIF("${VTK_MAJOR_VERSION}" GREATER 4) + #----------------------------------------------------------------------------- # Create vtkgdcm library ADD_LIBRARY(vtkgdcm ${VTKGDCM_LIB_SRCS}) @@ -202,6 +203,7 @@ TARGET_LINK_LIBRARIES(vtkWriteDicomExtended IF(NOT GDCM_INSTALL_NO_DEVELOPMENT) INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmReader.h) INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmWriter.h) + INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcm4DSplitter.h) ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT) IF(NOT GDCM_INSTALL_NO_LIBRARIES) diff --git a/vtk/test4DSplitter.cxx b/vtk/test4DSplitter.cxx index 249c4ce5..4fe34105 100644 --- a/vtk/test4DSplitter.cxx +++ b/vtk/test4DSplitter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: test4DSplitter.cxx,v $ Language: C++ - Date: $Date: 2011/03/30 14:50:44 $ - Version: $Revision: 1.1 $ + Date: $Date: 2011/03/31 16:12:33 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,15 +29,8 @@ On Wed, Feb 16, 2011 at 11:51 AM, Roger Bramon Feixas the same time. */ -//#include "gdcmDocEntry.h" -//#include "gdcmDicomDir.h" -//#include "gdcmDicomDirPatient.h" + #include "gdcmFile.h" -#include "gdcmFileHelper.h" -//#include "gdcmDirList.h" -//#include "gdcmDebug.h" -//#include "gdcmArgMgr.h" -#include "gdcmUtil.h" #include "gdcmSerieHelper.h" #include #include diff --git a/vtk/vtkGdcm4DSplitter.h b/vtk/vtkGdcm4DSplitter.h index 85f2046f..9162f47b 100644 --- a/vtk/vtkGdcm4DSplitter.h +++ b/vtk/vtkGdcm4DSplitter.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcm4DSplitter.h,v $ Language: C++ - Date: $Date: 2011/03/31 12:37:54 $ - Version: $Revision: 1.3 $ + Date: $Date: 2011/03/31 16:12:33 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -113,7 +113,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G int TypeResult; bool verbose; std::vector *ImageDataVector; - vtkImageData *ImageData + vtkImageData *ImageData; }; //} // end namespace gdcm