X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=475d71c2ece3d5e43b7cca71b430bd84714e680c;hb=3dc2328d98ad8d9e9f2b8516f8b04053e9cb9ccf;hp=96958337420eef588c35eb75c23d2030db570e35;hpb=52364c14a6ae132d7cedcfca51f49a6f411316a3;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 96958337..475d71c2 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,23 +1,16 @@
-// $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
+// gdcmUtil.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmUtil.h"
 
 #include <stdio.h>
 #include <ctype.h>   // For isspace
 #include <string.h>
-#include "gdcmUtil.h"
 
+//-----------------------------------------------------------------------------
 // Library globals.
 gdcmDebug dbg;
 
+//-----------------------------------------------------------------------------
 gdcmDebug::gdcmDebug(int level) {
    DebugLevel = level;
 }
@@ -28,14 +21,6 @@ void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
    std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
-void gdcmDebug::Assert(int Level, bool Test,
-                 const char * Msg1, const char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   if (!Test)
-      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
-
 void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
    if (!Test)
       return;
@@ -49,6 +34,14 @@ void gdcmDebug::Error(const char* Msg1, const char* Msg2,
    Exit(1);
 }
 
+void gdcmDebug::Assert(int Level, bool Test,
+                 const char * Msg1, const char * Msg2) {
+   if (Level > DebugLevel)
+      return ;
+   if (!Test)
+      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
+}
+
 void gdcmDebug::Exit(int a) {
 #ifdef __GNUC__
    std::exit(a);
@@ -58,10 +51,10 @@ void gdcmDebug::Exit(int a) {
 #endif
 }
 
-///////////////////////////////////////////////////////////////////////////
-gdcmVR      * gdcmGlobal::VR    = (gdcmVR*)0;
-gdcmTS      * gdcmGlobal::TS    = (gdcmTS*)0;
-gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0;
+//-----------------------------------------------------------------------------
+gdcmVR      *gdcmGlobal::VR    = (gdcmVR *)0;
+gdcmTS      *gdcmGlobal::TS    = (gdcmTS *)0;
+gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0;
 gdcmGlobal gdcmGlob;
 
 gdcmGlobal::gdcmGlobal(void) {
@@ -78,20 +71,21 @@ gdcmGlobal::~gdcmGlobal() {
    delete Dicts;
 }
 
-gdcmVR * gdcmGlobal::GetVR(void) {
+gdcmVR *gdcmGlobal::GetVR(void) {
    return VR;
 }
 
-gdcmTS * gdcmGlobal::GetTS(void) {
+gdcmTS *gdcmGlobal::GetTS(void) {
    return TS;
 }
-gdcmDictSet * gdcmGlobal::GetDicts(void) {
+
+gdcmDictSet *gdcmGlobal::GetDicts(void) {
    return Dicts;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
 // 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)) {
@@ -104,13 +98,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);
@@ -120,8 +113,7 @@ void Tokenize (const string& str,
 
 ///////////////////////////////////////////////////////////////////////////
 // to prevent a flashing screen when non-printable character
-
-char * _cleanString(char *v) {
+char *_cleanString(char *v) {
    char *d;
    int i, l;
    l = strlen(v);
@@ -137,44 +129,22 @@ char * _cleanString(char *v) {
 
 ///////////////////////////////////////////////////////////////////////////
 // to prevent a flashing screen when non-printable character
-
 std::string _CreateCleanString(std::string s) {
-/*   char *d, *di, *v;
-   int i, l;
-   v=(char*)s.c_str();
-   l = strlen(v);
-   d = di = strdup(v);
-   for (i=0; 
-        i<l ; 
-        i++,di++,v++) {
-      if (!isprint(*v))
-         *di = '.';
-      }	
-   return d;*/
-  string str=s;
-  for(int i=0;i<str.size();i++)
+  std::string str=s;
+  int n = str.size();
+  for(int i=0;i<n-1;i++)
   {
     if(!isprint(str[i]))
       str[i]='.';
   }
-
+  if(!isprint(str[n])) { // to avoid trouble with odd length fields
+                        // padded with zeo to become even
+  
+     if (str[n] == '\0') 
+        str[n] = ' ';
+     else
+        str[n] = '.';
+  }
   return(str);
 }
 
-///////////////////////////////////////////////////////////////////////////
-//
-// because it may not be associated to a dictionary ...
-
-std::string TranslateToKey(guint16 group, guint16 element) {
-	char trash[10];
-	string key;
-	// CLEAN ME: better call the iostream<< with the hex manipulator on.
-	// This requires some reading of the stdlibC++ sources to make the
-	// proper call (or copy).
-	sprintf(trash, "%04x|%04x", group , element);
-	key = trash;  // Convertion through assignement
-	return key;
-}
-
-
-