From 99ba2ce9a2b6d173ecf7be6e87f56ff37dfcb345 Mon Sep 17 00:00:00 2001 From: regrain Date: Tue, 13 Jan 2004 11:27:43 +0000 Subject: [PATCH] * src/gdcmIdo.h, gdcmHeaderIdo.cxx : remove the Ido unused files -- BeNours --- ChangeLog | 1 + gdcmPython/win32/_vtkGdcm.dsp | 4 ---- gdcmPython/win32/gdcmpyembedded.dsp | 6 +----- src/CMakeLists.txt | 1 - src/Makefile.am | 1 - src/gdcm.h | 1 - src/gdcmHeaderIdo.cxx | 30 ----------------------------- src/gdcmIdo.h | 19 ------------------ src/win32/gdcmdll.dsp | 12 ++---------- vtk/win32/vtkgdcm.dsp | 4 ---- 10 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 src/gdcmHeaderIdo.cxx delete mode 100644 src/gdcmIdo.h diff --git a/ChangeLog b/ChangeLog index ca945d84..cdfae207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * gdcmPython/testSuite.py : test the readable flag of file for tests * src/gdcmDict.cxx, gdcmElValSet.cxx : bug fix under windows for prints. It's lied to the stl compilation by MSVC (windows, always windows...) + * src/gdcmIdo.h, gdcmHeaderIdo.cxx : remove the Ido unused files 2004-01-12 Benoit Regrain * src/*.h : add comments diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp index a1cce459..4b434b6c 100644 --- a/gdcmPython/win32/_vtkGdcm.dsp +++ b/gdcmPython/win32/_vtkGdcm.dsp @@ -94,10 +94,6 @@ SOURCE=..\..\src\gdcmHeaderHelper.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmHeaderIdo.cxx -# End Source File -# Begin Source File - SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp index 80265df1..2878ce6f 100644 --- a/gdcmPython/win32/gdcmpyembedded.dsp +++ b/gdcmPython/win32/gdcmpyembedded.dsp @@ -53,7 +53,7 @@ LINK32=link.exe # Begin Special Build Tool ProjDir=. SOURCE="$(InputPath)" -PostBuild_Cmds=move $(ProjDir)\gdcm.py $(ProjDir)\..\ +PostBuild_Cmds=move $(ProjDir)\gdcm.py $(ProjDir)\..\ # End Special Build Tool # Begin Target @@ -112,10 +112,6 @@ SOURCE=..\..\src\gdcmHeader.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmHeaderIdo.cxx -# End Source File -# Begin Source File - SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 63d717e5..d7ad2795 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,7 +19,6 @@ SET(libgdcm_la_SOURCES gdcmDict.cxx gdcmDictSet.cxx gdcmElValSet.cxx - gdcmHeaderIdo.cxx gdcmFile.cxx gdcmVR.cxx gdcmTS.cxx diff --git a/src/Makefile.am b/src/Makefile.am index f073d71b..d252f51b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ libgdcm_la_SOURCES= \ gdcmDict.cxx \ gdcmDictSet.cxx \ gdcmElValSet.cxx \ - gdcmHeaderIdo.cxx \ gdcmFile.cxx \ gdcmVR.cxx \ gdcmTS.cxx \ diff --git a/src/gdcm.h b/src/gdcm.h index f7ec8fc6..6425d709 100644 --- a/src/gdcm.h +++ b/src/gdcm.h @@ -25,7 +25,6 @@ #include "gdcmHeader.h" #include "gdcmHeaderHelper.h" -#include "gdcmIdo.h" #include "gdcmFile.h" //#include "gdcmTS.h" diff --git a/src/gdcmHeaderIdo.cxx b/src/gdcmHeaderIdo.cxx deleted file mode 100644 index 28e40085..00000000 --- a/src/gdcmHeaderIdo.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// gdcmHeaderIdo.cxx - -#include "gdcmIdo.h" -#include "gdcmUtil.h" - -gdcmHeaderIdo::gdcmHeaderIdo (char* InFilename) - : gdcmHeader(InFilename) -{ -} - -void gdcmHeaderIdo::BuildHeader(void) { - gdcmHeaderIdo::BuildHeader(); - setAcrLibido(); -} - -/** - * \ingroup gdcmHeaderIdo - * \brief Si le recognition code (0008,0010) s'avere etre "ACR_LIBIDO", - * alors valide la reconnaissance du fichier en positionnant - * filetype. - */ -void gdcmHeaderIdo::setAcrLibido(void) { - std::string RecCode; - - RecCode = GetPubElValByNumber(0x0008, 0x0010); - if (RecCode == "ACRNEMA_LIBIDO" || - RecCode == "CANRME_AILIBOD" ) - filetype = ACR_LIBIDO; - return; -} diff --git a/src/gdcmIdo.h b/src/gdcmIdo.h deleted file mode 100644 index bd2a6986..00000000 --- a/src/gdcmIdo.h +++ /dev/null @@ -1,19 +0,0 @@ -// gdcmIdo.h - -#include "gdcmHeader.h" - -/* - * A gdcmHeaderIdo is a specific gdcmHeader that recognize - * the creation's source of the file : the libIdo library. - * Thus the file type is modified in consequence. - * - * \see gdcmHeader - */ -class gdcmHeaderIdo: protected gdcmHeader { -private: - void setAcrLibido(void); - void BuildHeader(void); - -public: - gdcmHeaderIdo(char* filename); -}; diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp index 9f868d4c..f1e959b2 100644 --- a/src/win32/gdcmdll.dsp +++ b/src/win32/gdcmdll.dsp @@ -58,7 +58,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ +PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ # End Special Build Tool !ELSEIF "$(CFG)" == "gdcmdll - Win32 Debug" @@ -90,7 +90,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ +PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ # End Special Build Tool !ENDIF @@ -140,10 +140,6 @@ SOURCE=..\gdcmHeaderHelper.cxx # End Source File # Begin Source File -SOURCE=..\gdcmHeaderIdo.cxx -# End Source File -# Begin Source File - SOURCE=..\gdcmJpeg.cxx # End Source File # Begin Source File @@ -224,10 +220,6 @@ SOURCE=..\gdcmHeaderHelper.h # End Source File # Begin Source File -SOURCE=..\gdcmIdo.h -# End Source File -# Begin Source File - SOURCE=..\gdcmTS.h # End Source File # Begin Source File diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp index c7a47bd5..ab875907 100644 --- a/vtk/win32/vtkgdcm.dsp +++ b/vtk/win32/vtkgdcm.dsp @@ -136,10 +136,6 @@ SOURCE=..\..\src\gdcmHeaderHelper.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmHeaderIdo.cxx -# End Source File -# Begin Source File - SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File -- 2.45.1