* src/*.cxx : added pragma disable 4786/4251 to get rid of ~4300 warning

  when building in debug mode
* vtk/win32/vtkgdcm.dsp : change /MT -> /MD and /MTd -> /MDd to match
  src/win32/gdcmdll.dsp
* vtk/win32/vtkgdcm.dsp : added /nodefaultlib "mscvrt" for debug mode

diff --git a/ChangeLog b/ChangeLog
index 68411b2146ba3d51ae200d1af8306e7e9faba791..7a8b734d376f77d120af68aff4dbb42537fdb2c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-05  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * src/*.cxx : added pragma disable 4786/4251 to get rid of ~4300 warning
+        when building in debug mode
+      * vtk/win32/vtkgdcm.dsp : change /MT -> /MD and /MTd -> /MDd to match 
+        src/win32/gdcmdll.dsp
+      * vtk/win32/vtkgdcm.dsp : added /nodefaultlib "mscvrt" for debug mode
 2003-08-29  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
       * Corrected a leak in vtkGdcmREader.cxx, the pSource was find thanks to valgrind.
 2003-07-29  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 2b8dff9e2b58fa2e9b86696cd694b6ecbcf99272..6808a8d0b27778cf83e319aefdab33fc3c875b85 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,5 +1,15 @@
 // gdcmDict.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 152e6d090d03a3a19c18e60652e238bca3c7ad0a..85449a083320d0ddc5f6914c69d7fe3f100f1be3 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,5 +1,15 @@
 // gdcmDictEntry.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <stdio.h>    // FIXME For sprintf
 #include "gdcmDictEntry.h"
 #include "gdcmUtil.h"

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index d75a14e21b94249cc5d8cd60a2ce7f823432ee26..c13cf1dfd991d6fb5b707e4b2c113b1952f56117 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,5 +1,16 @@
 // gdcmDictEntry
 
+#ifdef _MSC_VER
+//'identifier' : decorated name length exceeded, name was truncated
+//#pragma warning ( disable : 4503 )
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <fstream>
 #include <stdlib.h>  // For getenv
 #include "gdcmUtil.h"

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 58302b3d37979d44641b114cb86b393bbbbc85a6..38310a46769e95add14f58c9fa08561237b20dc6 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -1,5 +1,14 @@
 // gdcmElValSet.cxx
 
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <sstream>
 #include "gdcmUtil.h"
 #include "gdcmElValSet.h"

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index c1ee3086fcb29c3a90d2b79fcbc013560f14e3f5..53d40a73c0af6ab282e7cfbb6ad3d1ed55dddab9 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,3 +1,14 @@
+#ifdef _MSC_VER
+//'identifier' : not all control paths return a value
+//#pragma warning ( disable : 4715 )
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include "gdcmException.h"
 
 #include <typeinfo>

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 29cd7a76294d833cfb9c7c9608092287fe09d2cc..ddde9fe44edd128eaf2c2157508876e15d136801 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -1,5 +1,17 @@
 // gdcmFile.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'type' : forcing value to bool 'true' or 'false' (performance warning)
+//#pragma warning ( disable : 4800 )
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "iddcmjpeg.h" // for the 'LibIDO' Jpeg LossLess

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index d09ff768c75f84b974f083cf835927479ddb78dc..7262da32ffcde31abf7b202c23b24a94a75915fc 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,5 +1,16 @@
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.81 2003/09/05 11:53:39 malaterre Exp $
 
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.80 2003/07/28 12:21:09 malaterre Exp $
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+//'identifier' : not all control paths return a value
+//#pragma warning ( disable : 4715 )
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
 
 #include <stdio.h>
 #include <cerrno>

diff --git a/src/gdcmHeaderIdo.cxx b/src/gdcmHeaderIdo.cxx
index a6f1a4cd62e6636816f1281b84671943a0836e0e..cc905fdcd47c3faf6fd098a4631b56c509f17718 100644 (file)
--- a/src/gdcmHeaderIdo.cxx
+++ b/src/gdcmHeaderIdo.cxx
@@ -1,5 +1,15 @@
 // gdcmHeaderIdo.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include "gdcmIdo.h"
 #include "gdcmUtil.h"
 using namespace std;

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 4796cb46f570fc72c8fda1901a40f41cbcb17f88..01416f35de0c6b21525687ee9763e3c8e79ab5c9 100644 (file)
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -1,3 +1,13 @@
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <stdio.h>
 #include "gdcmFile.h"
 

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 3cc6c12591006cfe65aafbd50448ef14385d0bf8..4b1cff5db926e665bac1fd4091380aeb8c8eaa49 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -1,3 +1,13 @@
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <stdio.h>
 #include "gdcmFile.h"
 

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index fb942ba22438ac93bf53defc85c837227fda0583..293930040df33b40bf900370d037efb873207c46 100644 (file)
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -1,3 +1,12 @@
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
  
  
  /* -------------------------------------------------------------------- */

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index cc9fcaa1e226a57d8c10d6db9e35c707f6dbbde6..e927c298d1e2fbacb377be608fb01131ab890f5c 100644 (file)
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -1,3 +1,13 @@
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <stdio.h>
 #include "gdcmFile.h"
 #include "jpeg/libijg8/cdjpeg.h"               /* Common decls for cjpeg/djpeg applications */

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index bb18e34308b5da06eea488de6e102daa7794b3dd..e697e566893fa28e8e8e3a43bd55779701257979 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,5 +1,15 @@
 // gdcmTS.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include <stdio.h>
 
 #include "gdcmTS.h"

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 5cb02ac3ebb4f96ad0e092b8974388ed7e4ad1f7..817c93a905fecd6feda6577fbe002ec7d12efae5 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,4 +1,14 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.15 2003/07/01 15:48:27 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.16 2003/09/05 11:53:39 malaterre Exp $
+
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
 
 #include <stdio.h>
 #include <ctype.h>   // For isspace

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index c20aa4a2f0a5a515f8f72026c11c9a9bf5849543..64d708e366669dd9c5125dd92f6cc703a12a9db7 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,5 +1,15 @@
 // gdcmVR.cxx
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
 #include "gdcmVR.h"
 
 gdcmVR::gdcmVR(void) {

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index 90a718960f4a15a0d6810251008d7ca81df428f9..292d4b650a9e39000219700bd149938af3cf94fd 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "NDEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 Wsock32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\  copy Release\vtkgdcm.lib ..\..\lib\vtkgdcm.lib\r
@@ -73,7 +73,7 @@ PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\ copy Release\vtkgdcm.lib ..\..\lib
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "_DEBUG"\r
@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\  copy Debug\vtkgdcm.lib ..\..\lib\vtkgdcm.lib\r