X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=d3a8b46405b832b5afaaf45ec4414a5fd0ddbc7e;hb=00e89cde772e18e4f2baab2b01680330af909d59;hp=d76015df920331e0e149bf18033e6241d7ab4c0a;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index d76015df..d3a8b464 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2004/08/01 00:59:21 $ - Version: $Revision: 1.19 $ + Date: $Date: 2004/10/10 00:42:54 $ + Version: $Revision: 1.22 $ 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. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -44,7 +44,7 @@ gdcmDirList::gdcmDirList(std::string dirName, bool recursive) { name = dirName; - NormalizePath(name); + gdcmUtil::NormalizePath(name); Explore(name, recursive); } @@ -88,7 +88,7 @@ int gdcmDirList::Explore(std::string dirName, bool recursive) { int numberOfFiles = 0; std::string fileName; - NormalizePath(dirName); + gdcmUtil::NormalizePath(dirName); #if defined(_MSC_VER) || (__CYGWIN__) WIN32_FIND_DATA fileData; HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); @@ -135,7 +135,7 @@ int gdcmDirList::Explore(std::string dirName, bool recursive) { fileName = dirName + d->d_name; stat(fileName.c_str(), &buf); //really discard output ? - if( S_ISREG(buf.st_mode) ) //is it a regular file? + if( S_ISREG(buf.st_mode) ) //is it a regular file? { push_back( fileName ); numberOfFiles++;