mistyping corrected

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 82b0e570db4aa6343f90ab9ca1d899cfb5dba58c..2e6fef7b1d2eca9286b455597cb2f368df7e895c 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,10 +1,19 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.14 2003/07/01 10:04:36 frog Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.23 2003/09/24 13:27:02 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);
 }
 
@@ -57,7 +66,7 @@ gdcmGlobal gdcmGlob;
 
 gdcmGlobal::gdcmGlobal(void) {
    if (VR || TS || Dicts)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts allready allocated");
+      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
    VR = new gdcmVR();
    TS = new gdcmTS();
    Dicts = new gdcmDictSet();
@@ -82,7 +91,7 @@ gdcmDictSet * gdcmGlobal::GetDicts(void) {
 
 ///////////////////////////////////////////////////////////////////////////
 // Because is not yet available in g++2.96
-istream& eatwhite(istream& is) {
+std::istream& eatwhite(std::istream& is) {
    char c;
    while (is.get(c)) {
       if (!isspace(c)) {
@@ -96,12 +105,12 @@ istream& eatwhite(istream& is) {
 ///////////////////////////////////////////////////////////////////////////
 // Because is not  available in C++ (?)
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters) {
-   string::size_type lastPos = str.find_first_not_of(delimiters,0);
-   string::size_type pos     = str.find_first_of    (delimiters,lastPos);
-   while (string::npos != pos || string::npos != lastPos) {
+void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::string& delimiters) {
+   std::string::size_type lastPos = str.find_first_not_of(delimiters,0);
+   std::string::size_type pos     = str.find_first_of    (delimiters,lastPos);
+   while (std::string::npos != pos || std::string::npos != lastPos) {
       tokens.push_back(str.substr(lastPos, pos - lastPos));
       lastPos = str.find_first_not_of(delimiters, pos);
       pos     = str.find_first_of    (delimiters, lastPos);
@@ -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);
 }
 
 ///////////////////////////////////////////////////////////////////////////