* Update Windows projects and .cvsignore files

     -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 2a3565947080001e1bb3d40f3253c570820fcab2..c6ce492cc03d7de8350918960bc7281b3a4bc36c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,25 @@
+2003-12-10 Benoit Regrain
+     * Update Windows projects and .cvsignore files
+
 2003-11-12 Jean-Pierre Roux
      *ENH  gdcmHeader constructor has one more parameter (default value : false)
            that allows the user to 'go inside' the SeQuences only
           if he wants to.
           gdcmElValSet:Print takes it into account
-          
+
 2003-11-12  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
      *ENH: Update gdcmPython/CMakeLists
      *FIX: (gdcmHeaderHelper) GetRescale and GetSlope
      *FIX: (gdcmElValSet) char 'tag' was overiding private members (VC++)
-     
+
 2003-11-10 Jean-Pierre Roux
-      *FIX : gdcmHeader::LoadElements is now based 
-             on the ListTag listElem member, 
+      *FIX : gdcmHeader::LoadElements is now based
+             on the ListTag listElem member,
              not longer on the TagElValueHT tagHt member
       *ENH : PrintPubElVal shows (temporarily) both results,
              with the tagHt member and the listElem member.
             (it's easier to 'see' the problems when using Printheader)
-            
+
       *FIX : old private member LgrElem is now splitted into
              ReadLength   : Length actually found on disk (updated only
                            if bug fixing is necessary), for internal
@@ -25,7 +28,7 @@
                            or to allow Parser going on.
             Will allow to re-write a kosher header when a SeQuence
             with a length (not 0000) is found
-      Warning : gdcmFile::Write still uses the TagHt (not ListElem)     
+      Warning : gdcmFile::Write still uses the TagHt (not ListElem)
                because gdcmElValSet::Add does not update ListElem
                (to be written)
 
@@ -39,15 +42,15 @@
      *ENH: vtkgdcmViewer now works with LUT dicom (OT-PAL-face ...)
 
 2003-11-05  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
-     *ENH: vtkGdcmReader now supports LUT ! 
+     *ENH: vtkGdcmReader now supports LUT !
           (vtkgdcmViewer for now is not able to use them though)
-           
+
 2003-11-05 Jean-Pierre Roux
      * in testSuite.py : new files names for checking the package
      * Fix : Forgot to commit gdcmFile::GetImageDataSizeRaw();
              that returns the pixel area size to the *aware* (vtk) user
              that DOESN'T want to turn the PALETTE COLOR image into an RGB image
-     
+
 2003-11-05 Benoit Regrain
      * in testSuite.py : Modify the rules for checking the paths
                        : Explicit error messages

diff --git a/gdcmPython/.cvsignore b/gdcmPython/.cvsignore
index ab5d103c55fa06ad7415ebd7a8db40542a1b4c20..c700f9cd780762fac155bc9d96ea9e781af30a83 100644 (file)
--- a/gdcmPython/.cvsignore
+++ b/gdcmPython/.cvsignore
@@ -10,6 +10,7 @@ Makefile
 Makefile.in
 *.lo
 *.la
+*.dll
 .libs
 .deps
 _gdcm.so

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index 0fc813e34ceec8be808609b1b77494ff2528bd44..a1cce45933a11fdce077da99bd17e215308a444b 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
-CFG=_vtkGdcm - Win32 Debug\r
+CFG=_vtkGdcm - Win32 Release\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,7 +13,7 @@ CFG=_vtkGdcm - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "_vtkGdcm.mak" CFG="_vtkGdcm - Win32 Debug"\r
+!MESSAGE NMAKE /f "_vtkGdcm.mak" CFG="_vtkGdcm - Win32 Release"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
@@ -90,6 +90,10 @@ SOURCE=..\..\src\gdcmHeader.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmHeaderHelper.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -106,7 +110,7 @@ SOURCE=..\..\src\gdcmJpeg2000.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+SOURCE=..\..\src\gdcmParse.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 78cfc75e1a7b19c1dc04bc6665159aa0220ad724..80265df1c16dda10cf7742ef69981d9bda820a73 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
@@ -128,7 +128,7 @@ SOURCE=..\..\src\gdcmJpeg2000.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+SOURCE=..\..\src\gdcmParse.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index 86f281ac39e58ffc4c0c33798f1083321bc26fef..febe3eb8750767fc94d40b43e72ff200d0b2f5c9 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
@@ -156,6 +156,10 @@ SOURCE=..\gdcmJpeg2000.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\gdcmParse.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\gdcmRLE.cxx\r
 # End Source File\r
 # Begin Source File\r

diff --git a/vtk/.cvsignore b/vtk/.cvsignore
index d729749fb4c26c72b0230f8e5c5cbbbddfa87d3a..d5b1a8eb776843a6d9ea343283576e9987fef249 100644 (file)
--- a/vtk/.cvsignore
+++ b/vtk/.cvsignore
@@ -5,4 +5,5 @@ Makefile
 vtkgdcmdemo
 *.la
 *.lo
+*.dll
 vtkGdcmReaderPython.cxx

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index 109bdc250c5b78d48d3e11069d809ab7ac8a6fac..c7a47bd578ab1261bafc2e88d593a731c0351be9 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -152,7 +152,7 @@ SOURCE=..\..\src\gdcmJpeg2000.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+SOURCE=..\..\src\gdcmParse.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r