X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=4c053864a287ec7e4d79a998f0b6334c7d8aec58;hb=a5477cb88aa763acdea8f3fbd6e58d70cec8f42e;hp=c6a9d0365d3f24bd109a49ed64acd5da43632638;hpb=b9ab8805bd66e5fc6dc74788435df455899eb661;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index c6a9d036..4c053864 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,5 +1,21 @@ -// gdcmUtil.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/07/17 22:47:01 $ + Version: $Revision: 1.47 $ + + 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 @@ -58,7 +74,7 @@ std::string CreateCleanString(std::string s) { if(s[str.size()-1]==0) str[str.size()-1]=' '; - return(str); + return str; } /** @@ -86,13 +102,17 @@ void NormalizePath(std::string &name) */ std::string GetPath(std::string &fullName) { - int pos1=fullName.rfind("/"); - int pos2=fullName.rfind("\\"); - if(pos1>pos2) + int pos1 = fullName.rfind("/"); + int pos2 = fullName.rfind("\\"); + if( pos1 > pos2) + { fullName.resize(pos1); + } else + { fullName.resize(pos2); - return(fullName); + } + return fullName; } /** @@ -107,7 +127,7 @@ std::string GetName(std::string &fullName) if (a == '/' || a == '\\') { fin--; } - int deb; + int deb = 0; for (int i=fin;i!=0;i--) { if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') break; @@ -118,5 +138,5 @@ std::string GetName(std::string &fullName) for (int j=deb;j