Remaining \n in std::cout and std::cerr replaced by std::endl

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 5cb02ac3ebb4f96ad0e092b8974388ed7e4ad1f7..96958337420eef588c35eb75c23d2030db570e35 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,10 +1,19 @@
-// $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.20 2003/09/24 13:00:59 jpr 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
 #include <string.h>
 #include "gdcmUtil.h"
-using namespace std;
 
 // Library globals.
 gdcmDebug dbg;
@@ -16,7 +25,7 @@ gdcmDebug::gdcmDebug(int level) {
 void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
    if (Level > DebugLevel)
       return ;
-   std::cerr << Msg1 << ' ' << Msg2 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
 void gdcmDebug::Assert(int Level, bool Test,
@@ -24,19 +33,19 @@ void gdcmDebug::Assert(int Level, bool Test,
    if (Level > DebugLevel)
       return ;
    if (!Test)
-      std::cerr << Msg1 << ' ' << Msg2 << '\n';
+      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
 void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
    if (!Test)
       return;
-   std::cerr << Msg1 << ' ' << Msg2 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
    Exit(1);
 }
 
 void gdcmDebug::Error(const char* Msg1, const char* Msg2,
                       const char* Msg3) {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
    Exit(1);
 }
 
@@ -129,8 +138,8 @@ char * _cleanString(char *v) {
 ///////////////////////////////////////////////////////////////////////////
 // to prevent a flashing screen when non-printable character
 
-char * _CreateCleanString(string s) {
-   char *d, *di, *v;
+std::string _CreateCleanString(std::string s) {
+/*   char *d, *di, *v;
    int i, l;
    v=(char*)s.c_str();
    l = strlen(v);
@@ -141,7 +150,15 @@ char * _CreateCleanString(string s) {
       if (!isprint(*v))
          *di = '.';
       }        
-   return d;
+   return d;*/
+  string str=s;
+  for(int i=0;i<str.size();i++)
+  {
+    if(!isprint(str[i]))
+      str[i]='.';
+  }
+
+  return(str);
 }
 
 ///////////////////////////////////////////////////////////////////////////