* src/gdcmIdo.h, gdcmHeaderIdo.cxx : remove the Ido unused files

     -- BeNours

diff --git a/ChangeLog b/ChangeLog
index ca945d84739a76caa127df1dadc9e439089bba39..cdfae207fbc76ae3a1533c46b1d1e9cda1006de8 100644 (file)
--- 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 a1cce45933a11fdce077da99bd17e215308a444b..4b434b6c9513f896e1219fa169a2a4b03afa41cb 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -94,10 +94,6 @@ SOURCE=..\..\src\gdcmHeaderHelper.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\gdcmJpeg.cxx\r
 # End Source File\r
 # Begin Source File\r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 80265df1c16dda10cf7742ef69981d9bda820a73..2878ce6f7a6bb2baecf4d178618dfdf4a734f4fe 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -53,7 +53,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 ProjDir=.\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=move               $(ProjDir)\gdcm.py               $(ProjDir)\..\ \r
+PostBuild_Cmds=move                $(ProjDir)\gdcm.py                $(ProjDir)\..\ \r
 # End Special Build Tool\r
 # Begin Target\r
 \r
@@ -112,10 +112,6 @@ SOURCE=..\..\src\gdcmHeader.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\gdcmJpeg.cxx\r
 # End Source File\r
 # Begin Source File\r

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63d717e5b79d56e52c7d99271a9752d2b6b91aa8..d7ad27950447c945d9d188a23405730912f319af 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,6 @@ SET(libgdcm_la_SOURCES
        gdcmDict.cxx\r
        gdcmDictSet.cxx\r
        gdcmElValSet.cxx\r
-       gdcmHeaderIdo.cxx\r
        gdcmFile.cxx\r
        gdcmVR.cxx\r
        gdcmTS.cxx\r

diff --git a/src/Makefile.am b/src/Makefile.am
index f073d71b8dc8aa5226c44e7f7a2a71fd79c0c7dd..d252f51bffd95a3eb2a61f54870fca8083e0e78a 100644 (file)
--- 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 f7ec8fc6cb367fc68e93c6cefc99462663288e37..6425d7091e364c352ffbf0af61f58aae6a07f8c5 100644 (file)
--- 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 (file)
index 28e4008..0000000
--- 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 (file)
index bd2a698..0000000
--- 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 9f868d4c5db33bd3d9e36ede5e41b3b7fc7d8596..f1e959b232072cd895a440ff7ea59c564afe2762 100644 (file)
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy              ..\..\lib\gdcmdll.dll              ..\..\gdcmPython\                  copy              ..\..\lib\gdcmdll.dll              ..\..\test\                copy           Release\gdcmdll.lib           ..\..\lib\ \r
+PostBuild_Cmds=copy               ..\..\lib\gdcmdll.dll               ..\..\gdcmPython\                copy               ..\..\lib\gdcmdll.dll               ..\..\test\              copy            Release\gdcmdll.lib            ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"\r
@@ -90,7 +90,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy              ..\..\lib\gdcmdll.dll              ..\..\gdcmPython\                  copy              ..\..\lib\gdcmdll.dll              ..\..\test\                copy           Debug\gdcmdll.lib           ..\..\lib\ \r
+PostBuild_Cmds=copy               ..\..\lib\gdcmdll.dll               ..\..\gdcmPython\                copy               ..\..\lib\gdcmdll.dll               ..\..\test\              copy            Debug\gdcmdll.lib            ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ENDIF \r
@@ -140,10 +140,6 @@ SOURCE=..\gdcmHeaderHelper.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\gdcmHeaderIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\gdcmJpeg.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -224,10 +220,6 @@ SOURCE=..\gdcmHeaderHelper.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\gdcmIdo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\gdcmTS.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index c7a47bd578ab1261bafc2e88d593a731c0351be9..ab8759078e6811b2b3ff35dd89f1b98bfb66774f 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -136,10 +136,6 @@ SOURCE=..\..\src\gdcmHeaderHelper.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\gdcmJpeg.cxx\r
 # End Source File\r
 # Begin Source File\r