* FIX : WriteEntries : coding style & logic in parameters

     -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 7810b1a51339f87dec6b4fbd27dd322638974396..4f5da95732435866e47199e7a76c4d30d167d008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-02-04 Benoit Regrain
+     * FIX : WriteEntries : coding style & logic in parameters
+
 2004-02-03 Benoit Regrain
      * gdcmDirList : to parse a hard drive directory in recursive (or not)
      * gdcmDicomDir : add the load of directory

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index 596f6a4aa2980b7da88d67172fdeb67fcd1ffc79..b09c016c2452aa7e399d37edb0e2f7b611a0aff1 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -74,6 +74,10 @@ SOURCE=..\..\src\gdcmDictSet.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmDirList.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmException.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -166,6 +170,10 @@ SOURCE=..\vtkGdcmReaderPython.cxx
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmDirList.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\init.h\r
 # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdmReader > $(ProjDir)\vtkGdcmInit.cxx\r
 ProjDir=.\r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index de390fe5445f73466db33cdc6b59448afb21248f..51f6b8da01ed23293b4c260e1de0c7e6cb090cf4 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
@@ -96,6 +96,10 @@ SOURCE=..\..\src\gdcmDictSet.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmDirList.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmException.cxx\r
 # End Source File\r
 # Begin Source File\r

diff --git a/setup.py b/setup.py
index 6aeda18e82860e9faf55d2ed4c4adfde6b740ba2..65a5396024c0bd1d66d9fe864fd52759007ce90d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,8 @@ for Remove in Jpeg8SourcesToRemove:
 Sources.extend(Jpeg8Sources)
 
 Jpeg12Sources = glob.glob(os.path.join(gdcmJpeg12SrcDir,"j*.c"))
-Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 'jmemmac12.c']
+Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 
+                         'jmemmac12.c']
 for Remove in Jpeg12SourcesToRemove:
    ### Because setup.py is a multiple pass process we need to trap
    ### the case where the files were allready wed out on a previous pass.

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 111f0e0fa1d3d05bbc311cb1f6d44138d11fa69e..cd1ab61b5968db25ea628216e06f927fe5fb389f 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -289,7 +289,7 @@ bool gdcmDicomDir::Write(std::string fileName)
    fwrite("DICM",4,1,fp1);
    free(filePreamble);
 
-   WriteEntries(DICOMDIR,fp1);
+   WriteEntries(fp1,DICOMDIR);
 
    fclose(fp1);
 

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index 68ef779b7f0f7d5ea78106b183490d22d9b97089..178a7534a3a8cb5668600dd82412d39b60346d28 100644 (file)
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -434,7 +434,7 @@ bool gdcmParser::Write(FILE *fp, FileType type) {
       UpdateGroupLength(true,ACR);
 */
 
-   WriteEntries(type, fp);
+   WriteEntries(fp,type);
    return(true);
  }
 
@@ -1004,7 +1004,7 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) {
  *          (ACR-NEMA, ExplicitVR, ImplicitVR)
  * @param   _fp already open file pointer
  */
-void gdcmParser::WriteEntries(FileType type, FILE * _fp) 
+void gdcmParser::WriteEntries(FILE *_fp,FileType type)
 {
    guint16 gr, el;
    guint32 lgr;

diff --git a/src/gdcmParser.h b/src/gdcmParser.h
index d4739016e7eb742f6fe6a47cce42cbacaf829e32..be88d134b5a3972431a1267aad015bc3440a2351 100644 (file)
--- a/src/gdcmParser.h
+++ b/src/gdcmParser.h
@@ -134,7 +134,7 @@ protected:
    void LoadHeaderEntrySafe(gdcmHeaderEntry *);
 
    void UpdateGroupLength(bool SkipSequence = false, FileType type = ImplicitVR);
-   void WriteEntries(FileType type, FILE *);
+   void WriteEntries(FILE *_fp,FileType type);
 
 // Variables
    FILE *fp;

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index 9a90affee5f7a76166f9d93a2900a8d797005da3..15ac44492bb1a23e93058c41d5ef3171601ce0f5 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -112,6 +112,10 @@ SOURCE=..\..\src\gdcmDictSet.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmDirList.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmException.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -174,10 +178,6 @@ SOURCE=..\vtkGdcmReader.cxx
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=..\vtkGdcmReader.h\r
-# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r
@@ -197,6 +197,10 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 # End Group\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmDirList.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\libgdcmljpeg.lib\r
 # End Source File\r
 # Begin Source File\r