From 3e78befc911eac2ecc70747854911d1f803797b5 Mon Sep 17 00:00:00 2001
From: regrain <regrain>
Date: Wed, 21 May 2003 16:26:26 +0000
Subject: [PATCH]       * src/*.[h] all occurences of stl classes are now
 prefixed with         std::, and all occurences of "using namespace std;"
 where removed.         This is to avoid pollution of global namespace in
 included files.         Apparently vtk does not avoid this pitfall: when
 using both         gdcm and vtk (as in vtk/vtkGdcmReader.cxx) this ended up
 in a         collision of various stl members (principally cout...).       *
 gdcmPython/gdcm.i now declares a typemap for std::string (to          comply
 with above changes)       -- Frog & BeNours

---
 gdcm.dsw                            |  38 +++-
 gdcmPython/gdcm.i                   |   6 +
 gdcmPython/win32/_vtkGdcm.dsp       | 101 +++++++++
 gdcmPython/win32/gdcmpyembedded.dsp |   8 +-
 gdcmPython/win32/init.h             |  13 ++
 src/gdcmDict.cxx                    |  15 +-
 src/gdcmDict.h                      |   6 +-
 src/gdcmDictEntry.cxx               |   6 +-
 src/gdcmDictSet.cxx                 |   1 +
 src/gdcmDictSet.h                   |   2 +-
 src/gdcmElValSet.cxx                |   1 +
 src/gdcmElValSet.h                  |   6 +-
 src/gdcmException.cxx               |   1 +
 src/gdcmException.h                 |   2 +-
 src/gdcmFile.cxx                    |   1 +
 src/gdcmHeader.cxx                  |   6 +-
 src/gdcmHeader.h                    |  10 +-
 src/gdcmHeaderIdo.cxx               |   1 +
 src/gdcmUtil.cxx                    |   3 +-
 src/gdcmUtil.h                      |   4 +-
 src/win32/{gdcmdll => }/gdcmdll.dsp | 322 ++++++++++++++--------------
 vtk/testvtkGdcmReader.cxx           |  39 ++--
 vtk/vtkGdcmReader.cxx               |  15 +-
 vtk/win32/vtkGdcmTest.dsp           | 130 +++++++++++
 vtk/win32/vtkgdcm.dsp               | 175 +++++++++++++++
 25 files changed, 695 insertions(+), 217 deletions(-)
 create mode 100644 gdcmPython/win32/_vtkGdcm.dsp
 create mode 100644 gdcmPython/win32/init.h
 rename src/win32/{gdcmdll => }/gdcmdll.dsp (83%)
 create mode 100644 vtk/win32/vtkGdcmTest.dsp
 create mode 100644 vtk/win32/vtkgdcm.dsp

diff --git a/gdcm.dsw b/gdcm.dsw
index 0efc59e7..7771a996 100644
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -3,7 +3,19 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "gdcmdll"=.\SRC\WIN32\gdcmdll\gdcmdll.dsp - Package Owner=<4>
+Project: "_vtkGdcm"=.\GDCMPYTHON\WIN32\_vtkGdcm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gdcmdll"=.\src\win32\gdcmdll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,6 +51,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "vtkGdcmTest"=.\VTK\WIN32\vtkGdcmTest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "vtkgdcm"=.\VTK\WIN32\vtkgdcm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 02ddf0ac..15c6ff38 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -10,6 +10,8 @@
 #include "gdcmFile.h"
 using namespace std;
 
+using namespace std;
+
 // Utility functions on strings for removing leading and trailing spaces
 void EatLeadingAndTrailingSpaces(string & s) {
 	while ( s.length() && (s[0] == ' ') )
@@ -93,6 +95,10 @@ typedef  unsigned int guint32;
 %typemap(out) string  {
     $result = PyString_FromString(($1).c_str());
 }
+%typemap(out) std::string  {
+    $result = PyString_FromString(($1).c_str());
+}
+//////%apply int { std::int };    
 
 ////////////////////////////////////////////////////////////////////////////
 %include "gdcmCommon.h"
diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
new file mode 100644
index 00000000..8e9b6f65
--- /dev/null
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -0,0 +1,101 @@
+# Microsoft Developer Studio Project File - Name="_vtkGdcm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=_vtkGdcm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "_vtkGdcm.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "_vtkGdcm.mak" CFG="_vtkGdcm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "_vtkGdcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "_vtkGdcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ  /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "_vtkGdcm - Win32 Release"
+# Name "_vtkGdcm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index c3b69515..caa48e4c 100644
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -57,7 +57,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
 
 !ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"
@@ -88,7 +88,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 ProjDir=.
 SOURCE="$(InputPath)"
-PostBuild_Cmds=mv       $(ProjDir)\gdcm.py       $(ProjDir)\..\ 
+PostBuild_Cmds=mv        $(ProjDir)\gdcm.py        $(ProjDir)\..\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -179,6 +179,10 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 
 SOURCE=..\..\src\gdcmUtil.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmVR.cxx
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/gdcmPython/win32/init.h b/gdcmPython/win32/init.h
new file mode 100644
index 00000000..24e0d445
--- /dev/null
+++ b/gdcmPython/win32/init.h
@@ -0,0 +1,13 @@
+/*=========================================================================
+Init.h
+ne sert a rien, si ce n'est a pouvoir lancer automatiquement 
+via le settings de init.h :-) 
+la generation du fichier cxx necessaire a la DLL python 
+
+=========================================================================*/
+
+// Sur ce fichier en environnement windows, on appelle (Settings)
+// $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython 
+//    vtkGdcmReader  > vtkGdcmInit.cxx
+// Le binaire initwrappython n'est pas livre avec VTK, on l'a ecrit et vous pouvez recuperer
+// le source dans le module 'wrap' de CREATIS/CVS
diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index d115e0a0..86a041c4 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,13 +3,14 @@
 #include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
+using namespace std;
 
 /**
  * \ingroup gdcmDict
  * \brief   Construtor
  * @param   FileName from which to build the dictionary.
  */
-gdcmDict::gdcmDict(string & FileName) {
+gdcmDict::gdcmDict(std::string & FileName) {
 	std::ifstream from(FileName.c_str());
 	dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary",
                     FileName.c_str());
@@ -21,7 +22,7 @@ gdcmDict::gdcmDict(string & FileName) {
 	TagName fourth;
 	TagName name;
 	while (!from.eof()) {
-		from >> hex >> group >> element;
+		from >> std::hex >> group >> element;
 		eatwhite(from);
 		from.getline(buff, 256, ' ');
 		vr = buff;
@@ -52,7 +53,7 @@ gdcmDict::~gdcmDict() {
    NameHt.clear();
 }
 
-void gdcmDict::Print(ostream& os) {
+void gdcmDict::Print(std::ostream& os) {
 	PrintByKey(os);
 }
 
@@ -62,7 +63,7 @@ void gdcmDict::Print(ostream& os) {
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
  */
-void gdcmDict::PrintByKey(ostream& os) {
+void gdcmDict::PrintByKey(std::ostream& os) {
 	for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
 		os << "Tag : ";
 		os << "(" << hex << tag->second->GetGroup() << ',';
@@ -79,14 +80,14 @@ void gdcmDict::PrintByKey(ostream& os) {
  *          Entries will be sorted by the name of the dictionary entries.
  * @param   os The output stream to be written to.
  */
-void gdcmDict::PrintByName(ostream& os) {
+void gdcmDict::PrintByName(std::ostream& os) {
 	for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){
 		os << "Tag : ";
 		os << tag->second->GetName() << ",";
 		os << tag->second->GetVR() << ", ";
 		os << tag->second->GetFourth() << ", ";
-		os << "(" << hex << tag->second->GetGroup() << ',';
-		os << hex << tag->second->GetElement() << ") = " << dec << endl;
+		os << "(" << std::hex << tag->second->GetGroup() << ',';
+		os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl;
 	}
 }
 
diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index dfab30c3..37d0076e 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -36,9 +36,9 @@ public:
 	int RemoveEntry (guint16 group, guint16 element);
 	gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
 	gdcmDictEntry * GetTagByName(TagName name);
-	void Print(ostream&);
-	void PrintByKey(ostream&);
-	void PrintByName(ostream&);
+	void Print(std::ostream&);
+	void PrintByKey(std::ostream&);
+	void PrintByName(std::ostream&);
 	TagKeyHT & GetEntries(void) { return KeyHt; }
 };
 
diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 8823ac73..152e6d09 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -6,8 +6,8 @@
 
 
 gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
-                             string  InVr, string InFourth,
-                             string  InName) {
+									  std::string  InVr, std::string InFourth,
+									  std::string  InName) {
 	group 		= InGroup;
 	element 	= InElement;
 	vr 		= InVr;
@@ -32,7 +32,7 @@ TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
  * \brief       If-and only if-the vr is unset then overwrite it.
  * @param NewVr New vr to be set.
  */
-void gdcmDictEntry::SetVR(string NewVr) {
+void gdcmDictEntry::SetVR(std::string NewVr) {
 	if ( IsVrUnknown() )
 		vr = NewVr;
 	else {
diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 9a8bea4c..5262e30d 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -4,6 +4,7 @@
 #include <stdlib.h>  // For getenv
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
+using namespace std;
 
 #define PUB_DICT_NAME     "DicomV3Dict"
 #ifndef PUB_DICT_PATH
diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index f2f50634..8d9f5b04 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -41,7 +41,7 @@ public:
 	// TODO Swig std::string* GetAllDictNames();
 	gdcmDictSet(void);
 	~gdcmDictSet(void);
-	void Print(ostream&);
+	void Print(std::ostream&);
 	gdcmDict* GetDict(DictKey DictName);
 	gdcmDict* GetDefaultPubDict(void);
 };
diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 70fd2a7a..fa1aa113 100644
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -3,6 +3,7 @@
 #include <sstream>
 #include "gdcmUtil.h"
 #include "gdcmElValSet.h"
+using namespace std;
 
 gdcmElValSet::~gdcmElValSet() {
    for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag) {
diff --git a/src/gdcmElValSet.h b/src/gdcmElValSet.h
index 5def2edc..a64b105a 100644
--- a/src/gdcmElValSet.h
+++ b/src/gdcmElValSet.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.12 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.13 2003/05/21 16:26:28 regrain Exp $
 
 #ifndef GDCMELVALSET_H
 #define GDCMELVALSET_H
@@ -24,8 +24,8 @@ public:
    ~gdcmElValSet();
    void Add(gdcmElValue*);
 			
-   void Print(ostream &);
-   void PrintByName(ostream &);
+   void Print(std::ostream &);
+   void PrintByName(std::ostream &);
    int  Write(FILE *fp, FileType type);
 
    gdcmElValue* GetElementByNumber(guint16 group, guint16 element);
diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index fcf2f314..c1ee3086 100644
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -2,6 +2,7 @@
 
 #include <typeinfo>
 #include <stdio.h>
+using namespace std;
 
 
 gdcmException::gdcmException(const string &f, const string& msg) throw()
diff --git a/src/gdcmException.h b/src/gdcmException.h
index f347b6af..250fb605 100644
--- a/src/gdcmException.h
+++ b/src/gdcmException.h
@@ -78,7 +78,7 @@ class GDCM_EXPORT gdcmException : public exception {
  * @param e exception to print
  * @returns output stream os
  */
-ostream& operator<<(ostream &os, const gdcmException &e);
+std::ostream& operator<<(std::ostream &os, const gdcmException &e);
 
 
 /**
diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index ae734628..2b09d36d 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,6 +3,7 @@
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "iddcmjpeg.h"
+using namespace std;
 
 /////////////////////////////////////////////////////////////////
 /**
diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 48ebc838..eeba8216 100644
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.66 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.67 2003/05/21 16:26:28 regrain Exp $
 
 #include <stdio.h>
 #include <cerrno>
@@ -1564,11 +1564,11 @@ void gdcmHeader::LoadElements(void) {
       }
 }
 
-void gdcmHeader::PrintPubElVal(ostream & os) {
+void gdcmHeader::PrintPubElVal(std::ostream & os) {
    PubElValSet.Print(os);
 }
 
-void gdcmHeader::PrintPubDict(ostream & os) {
+void gdcmHeader::PrintPubDict(std::ostream & os) {
    RefPubDict->Print(os);
 }
 
diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index a634e1f5..5ee21488 100644
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.24 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.25 2003/05/21 16:26:28 regrain Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
@@ -108,8 +108,8 @@ protected:
    bool OpenFile(bool exception_on_error = false)
      throw(gdcmFileError);
    bool CloseFile(void);
-   int write(ostream&);   
-   int anonymize(ostream&);  // FIXME : anonymize should be a friend ?
+   int write(std::ostream&);   
+   int anonymize(std::ostream&);  // FIXME : anonymize should be a friend ?
 public:
    bool IsReadable(void);
    bool IsImplicitVRLittleEndianTransferSyntax(void);
@@ -142,8 +142,8 @@ public:
    std::string GetPubElValRepByNumber(guint16 group, guint16 element);
 
    TagElValueHT & GetPubElVal(void) { return PubElValSet.GetTagHt(); };
-   void   PrintPubElVal(ostream & os = cout);
-   void   PrintPubDict (ostream & os = cout);
+   void   PrintPubElVal(std::ostream & os = std::cout);
+   void   PrintPubDict (std::ostream & os = std::cout);
      
    // TODO Swig std::string* GetShaTagNames(); 
    std::string GetShaElValByName(std::string TagName);
diff --git a/src/gdcmHeaderIdo.cxx b/src/gdcmHeaderIdo.cxx
index 4cd5d9f1..a6f1a4cd 100644
--- a/src/gdcmHeaderIdo.cxx
+++ b/src/gdcmHeaderIdo.cxx
@@ -2,6 +2,7 @@
 
 #include "gdcmIdo.h"
 #include "gdcmUtil.h"
+using namespace std;
 
 gdcmHeaderIdo::gdcmHeaderIdo (char* InFilename)
 	: gdcmHeader(InFilename)
diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 54c2a476..1c521040 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,7 +1,8 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.10 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.11 2003/05/21 16:26:28 regrain Exp $
 
 #include <ctype.h>   // For isspace
 #include "gdcmUtil.h"
+using namespace std;
 
 // Library globals.
 gdcmDebug dbg;
diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index e00e8934..08e26fb3 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.9 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.10 2003/05/21 16:26:28 regrain Exp $
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
@@ -32,7 +32,7 @@ public:
    static gdcmDictSet * GetDicts(void);
 };
 
-istream & eatwhite(istream & is);
+std::istream & eatwhite(std::istream & is);
 
 void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
diff --git a/src/win32/gdcmdll/gdcmdll.dsp b/src/win32/gdcmdll.dsp
similarity index 83%
rename from src/win32/gdcmdll/gdcmdll.dsp
rename to src/win32/gdcmdll.dsp
index b3e8e0ae..ea18140f 100644
--- a/src/win32/gdcmdll/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -1,159 +1,163 @@
-# Microsoft Developer Studio Project File - Name="gdcmdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdcmdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gdcmdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gdcmdll.mak" CFG="gdcmdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gdcmdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdcmdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gdcmdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../../../python/gdcmdll.dll"
-# SUBTRACT LINK32 /debug
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy   ..\..\..\python\gdcmdll.dll   ..\..\..\test\ 
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../python/gdcmdll.dll" /pdbtype:sept
-# SUBTRACT LINK32 /incremental:no
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy   ..\..\..\python\gdcmdll.dll   ..\..\..\test\ 
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gdcmdll - Win32 Release"
-# Name "gdcmdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\gdcmDict.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmDictEntry.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmDictSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmElValSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmElValue.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmException.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmFile.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gdcmHeader.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
-
-SOURCE=..\..\gdcmUtil.cxx
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gdcmdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=gdcmdll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gdcmdll.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gdcmdll.mak" CFG="gdcmdll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gdcmdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gdcmdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gdcmdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../../../lib/gdcmdll.dll"
+# SUBTRACT LINK32 /debug
+# 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\ 
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../lib/gdcmdll.dll" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no
+# 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\ 
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gdcmdll - Win32 Release"
+# Name "gdcmdll - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\gdcmDict.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmDictEntry.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmDictSet.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmElValSet.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmElValue.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmException.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmFile.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmHeader.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
+
+SOURCE=..\gdcmUtil.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmVR.cxx
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/vtk/testvtkGdcmReader.cxx b/vtk/testvtkGdcmReader.cxx
index c561790e..62080883 100644
--- a/vtk/testvtkGdcmReader.cxx
+++ b/vtk/testvtkGdcmReader.cxx
@@ -1,23 +1,24 @@
-// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.3 2003/05/21 08:21:17 frog Exp $
+// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.4 2003/05/21 16:26:29 regrain Exp $
 
-#include "vtkRenderer.h"
-#include "vtkRenderWindow.h"
-#include "vtkRenderWindowInteractor.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkActor.h"
-#include "vtkImageMapper.h"
-#include "vtkImageViewer.h"
-#include "vtkMatrix4x4.h"
-#include "vtkLookupTable.h"
-#include "vtkMatrixToLinearTransform.h"
-#include "vtkTexture.h"
-#include "vtkPlaneSource.h"
-#include "vtkTextureMapToPlane.h"
-#include "vtkDataSetMapper.h"
-#include "vtkActor.h"
-#include "vtkImageCast.h"
-#include "vtkPNGWriter.h"
-#include "vtkTexture.h"
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkActor.h>
+#include <vtkImageMapper.h>
+#include <vtkImageData.h>
+#include <vtkImageViewer.h>
+#include <vtkMatrix4x4.h>
+#include <vtkLookupTable.h>
+#include <vtkMatrixToLinearTransform.h>
+#include <vtkTexture.h>
+#include <vtkPlaneSource.h>
+#include <vtkTextureMapToPlane.h>
+#include <vtkDataSetMapper.h>
+#include <vtkActor.h>
+#include <vtkImageCast.h>
+#include <vtkPNGWriter.h>
+#include <vtkTexture.h>
 
 #include "vtkGdcmReader.h"
 
diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 03368d41..5dbc83eb 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,9 +1,10 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.3 2003/05/21 08:21:17 frog Exp $
-#include "vtkGdcmReader.h"
-#include "vtkByteSwap.h"
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.4 2003/05/21 16:26:29 regrain Exp $
+//CLEANME#include <vtkByteSwap.h>
 #include <stdio.h>
-#include "vtkObjectFactory.h"
-#include "vtkImageFlip.h"
+#include <vtkObjectFactory.h>
+#include <vtkImageData.h>
+#include <vtkPointData.h>
+#include "vtkGdcmReader.h"
 #include "gdcm.h"
 
 vtkGdcmReader::vtkGdcmReader()
@@ -98,7 +99,7 @@ void vtkGdcmReader::ExecuteInformation()
   // since the // reading of the file is done by gdcm
 
   // But we need to set up the data type for downstream filters:
-  string type = GdcmHeader.GetPixelType();
+  std::string type = GdcmHeader.GetPixelType();
   if      ( type == "8U" )
     {
     vtkDebugMacro("8 bits unsigned image");
@@ -134,7 +135,7 @@ void vtkGdcmReader::ExecuteInformation()
   else
     {
     vtkErrorMacro("Bad File Type " << this->InternalFileName
-                                   << "Type " << type);
+                                   << "Type " << type.c_str());
     return;
     }
 
diff --git a/vtk/win32/vtkGdcmTest.dsp b/vtk/win32/vtkGdcmTest.dsp
new file mode 100644
index 00000000..d7db2a06
--- /dev/null
+++ b/vtk/win32/vtkGdcmTest.dsp
@@ -0,0 +1,130 @@
+# Microsoft Developer Studio Project File - Name="vtkGdcmTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=vtkGdcmTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "vtkGdcmTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "vtkGdcmTest.mak" CFG="vtkGdcmTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vtkGdcmTest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "vtkGdcmTest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vtkGdcmTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vtkGdcmTest___Win32_Release"
+# PROP BASE Intermediate_Dir "vtkGdcmTest___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vtkGdcmTest___Win32_Release"
+# PROP Intermediate_Dir "vtkGdcmTest___Win32_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\vtkGdcmTest.exe"
+
+!ELSEIF  "$(CFG)" == "vtkGdcmTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vtkGdcmTest___Win32_Debug0"
+# PROP BASE Intermediate_Dir "vtkGdcmTest___Win32_Debug0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vtkGdcmTest___Win32_Debug0"
+# PROP Intermediate_Dir "vtkGdcmTest___Win32_Debug0"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  Wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\vtkGdcmTest.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vtkGdcmTest - Win32 Release"
+# Name "vtkGdcmTest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\testvtkGdcmReader.cxx
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkRendering.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkGraphics.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkImaging.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkIO.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\vtkgdcm.lib
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
new file mode 100644
index 00000000..ce44e53b
--- /dev/null
+++ b/vtk/win32/vtkgdcm.dsp
@@ -0,0 +1,175 @@
+# Microsoft Developer Studio Project File - Name="vtkgdcm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=vtkgdcm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "vtkgdcm.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "vtkgdcm.mak" CFG="vtkgdcm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vtkgdcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vtkgdcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vtkgdcm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 Wsock32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../../lib/"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\	copy Release\vtkgdcm.lib ..\..\lib\vtkgdcm.lib
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "vtkgdcm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../../lib/"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\	copy Debug\vtkgdcm.lib ..\..\lib\vtkgdcm.lib
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vtkgdcm - Win32 Release"
+# Name "vtkgdcm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\gdcmDict.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmDictEntry.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmDictSet.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmElValSet.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmElValue.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmException.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmFile.cxx
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\..\src\gdcmUtil.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmVR.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\vtkGdcmReader.cxx
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkIO.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib
+# End Source File
+# Begin Source File
+
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
+# End Source File
+# End Group
+# End Target
+# End Project
-- 
2.48.1