X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=649f98931c97b482af7a5ffd10ef2ec7d05d2a7a;hb=16887ff26b068405a235a6a8a37f4e62516de393;hp=ae7f0675aef740e99935503dd8308c155de13eb2;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index ae7f0675..649f9893 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,89 +1,27 @@
-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/23 03:36:24 $
+  Version:   $Revision: 1.45 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 #include <stdio.h>
 #include <ctype.h>   // For isspace
 #include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
-
-/**
- * \ingroup Globals
- * \brief Pointer to a container, holding _all_ the Dicom Dictionaries.
- */
-gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the 'Value Representations'.
- */
-gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the Transfer Syntax codes
- *          and their english description 
- */
-gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to the hash table containing the Dicom Elements
- *          necessary to describe each part of a DICOMDIR 
- */
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
-
-/**
- * \ingroup Globals
- * \brief   Global container
- */
-gdcmGlobal gdcmGlob;
-
-/**
- * \ingroup gdcmGlobal
- * \brief   constructor : populates the
- */
-gdcmGlobal::gdcmGlobal(void) {
-   if (VR || TS || Dicts || ddElem)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   Dicts  = new gdcmDictSet();
-   VR     = new gdcmVR();
-   TS     = new gdcmTS();
-   ddElem = new gdcmDicomDirElement();
-}
-
-/**
- * \ingroup gdcmGlobal
- * \brief   canonical destructor 
- */
-gdcmGlobal::~gdcmGlobal() {
-   delete Dicts;
-   delete VR;
-   delete TS;
-   delete ddElem;
-}
-
-gdcmVR *gdcmGlobal::GetVR(void) {
-   return VR;
-}
-
-gdcmTS *gdcmGlobal::GetTS(void) {
-   return TS;
-}
-
-gdcmDictSet *gdcmGlobal::GetDicts(void) {
-   return Dicts;
-}
-
-gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
-   return ddElem;
-}
-
-/**
- * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to NO class,
- *           dealing with strings, file names... that can be called
- *           from anywhere by whomsoever they can help.
- */
+#include <iostream>
 
 /**
  * \ingroup Globals
@@ -120,30 +58,12 @@ void Tokenize (const std::string& str,
  * \ingroup Globals
  * \brief  Weed out a string from the non-printable characters (in order
  *         to avoid corrupting the terminal of invocation when printing)
- * @param v characters array to remove non printable characters from
- */
-char *_cleanString(char *v) {
-   char *d;
-   int i, l;
-   l = strlen(v);
-   for (i=0,d=v; 
-      i<l ; 
-      i++,d++) {
-         if (!isprint(*d))
-         *d = '.';
-   }
-   return v;
-}
-
-/**
- * \ingroup Globals
- * \brief   to prevent a flashing screen when non-printable character
  * @param s string to remove non printable characters from
  */
-std::string _CreateCleanString(std::string s) {
+std::string CreateCleanString(std::string s) {
    std::string str=s;
 
-   for(int i=0;i<str.size();i++)
+   for(unsigned int i=0;i<str.size();i++)
    {
       if(!isprint(str[i]))
          str[i]='.';
@@ -154,7 +74,7 @@ std::string _CreateCleanString(std::string s) {
          if(s[str.size()-1]==0)
             str[str.size()-1]=' ';
 
-   return(str);
+   return str;
 }
 
 /**
@@ -188,7 +108,7 @@ std::string GetPath(std::string &fullName)
       fullName.resize(pos1);
    else
       fullName.resize(pos2);
-   return(fullName);
+   return fullName;
 }
 
 /**
@@ -214,5 +134,5 @@ std::string GetName(std::string &fullName)
   for (int j=deb;j<fin+1;j++)
     lastName=lastName+fullName.c_str()[j];
 
-  return(lastName);
+  return lastName;
 }